From bdcc61ca76019b7b9162eab39d09d2c21a000226 Mon Sep 17 00:00:00 2001
From: Liam <liam@fascinated.cc>
Date: Sun, 8 Oct 2023 16:33:34 +0100
Subject: [PATCH] update

---
 .gitea/workflows/publish.yaml   | 58 +++++++++++++--------------------
 gitea-runner/DockerDockerfile   | 10 ------
 gitea-runner/Java17Dockerfile   | 10 ------
 gitea-runner/MavenDockerfile    | 10 ------
 gitea-runner/NginxPHPDockerfile |  4 ---
 5 files changed, 23 insertions(+), 69 deletions(-)
 delete mode 100644 gitea-runner/DockerDockerfile
 delete mode 100644 gitea-runner/Java17Dockerfile
 delete mode 100644 gitea-runner/MavenDockerfile
 delete mode 100644 gitea-runner/NginxPHPDockerfile

diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml
index 288808a..e656661 100644
--- a/.gitea/workflows/publish.yaml
+++ b/.gitea/workflows/publish.yaml
@@ -1,61 +1,49 @@
-Actions name: Publish
-# hi john
+name: Publish Docker Image
+
 on:
-  schedule:
-    - cron: "0 0 * * 0" # Every 7 days
   push:
     branches:
       - "master"
 
 jobs:
   docker:
-    strategy:
-      matrix:
-        arch: ["ubuntu-20.04"]
-        git-version: ["2.38.4"]
-      max-parallel: 3
-      fail-fast: true
-    runs-on: ${{ matrix.arch }}
+    runs-on: ubuntu-20.04
     steps:
-      - name: Checkout
-        uses: https://github.com/actions/checkout@v3
+      - name: Get branch name
+        id: branch-name
+        uses: tj-actions/branch-names@v7
 
-      - name: Download Docker
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Restore Docker Cache
+        uses: actions/cache@v3
+        id: docker-cache
+        with:
+          path: /usr/bin/docker
+          key: ${{ runner.os }}-docker
+
+      - name: Install Docker (if not cached)
+        if: steps.docker-cache.outputs.cache-hit != 'true'
         run: |
           wget -q -O /tmp/docker.tgz https://download.docker.com/linux/static/stable/x86_64/docker-20.10.23.tgz \
           && tar --extract --file /tmp/docker.tgz --directory /usr/bin --strip-components 1 --no-same-owner docker/docker \
-          && rm -rf /tmp/*
+          && rm -rf /tmp/* &&
+          echo "Done"
 
       - name: Set up Docker Buildx
-        uses: https://github.com/docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v2
 
       - name: Login to Repo
-        uses: https://github.com/docker/login-action@v2
+        uses: docker/login-action@v2
         with:
-          registry: git.fascinated.cc
           username: ${{ secrets.REPO_USERNAME }}
           password: ${{ secrets.REPO_TOKEN }}
 
-      - name: Build and Push (Docker)
-        uses: docker/build-push-action@v4
-        with:
-          push: true
-          context: ./gitea-runner
-          file: ./gitea-runner/DockerDockerfile
-          tags: git.fascinated.cc/fascinated/gitea-runner:docker
-
-      - name: Build and Push (Node Latest)
+      - name: Build and Push (Latest)
         uses: docker/build-push-action@v4
         with:
           push: true
           context: ./gitea-runner
           file: ./gitea-runner/NodeLatestDockerfile
           tags: git.fascinated.cc/fascinated/gitea-runner:node-latest
-
-      - name: Build and Push (Java 17)
-        uses: docker/build-push-action@v4
-        with:
-          push: true
-          context: ./gitea-runner
-          file: ./gitea-runner/Java17Dockerfile
-          tags: git.fascinated.cc/fascinated/gitea-runner:java-17
diff --git a/gitea-runner/DockerDockerfile b/gitea-runner/DockerDockerfile
deleted file mode 100644
index c114176..0000000
--- a/gitea-runner/DockerDockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM ubuntu:22.04
-
-# Configure DPKG, Run APT Update & Install Packages
-RUN set -e \
-  && dpkg --configure -a \
-  && apt update -y \
-  && apt install curl apt-utils -y
-
-# Install Docker
-RUN curl -sSL https://get.docker.com/ | CHANNEL=stable bash
\ No newline at end of file
diff --git a/gitea-runner/Java17Dockerfile b/gitea-runner/Java17Dockerfile
deleted file mode 100644
index 3a0c774..0000000
--- a/gitea-runner/Java17Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM git.rainnny.club/rainnny/gitea-runner:docker
-
-# Update & Install packages
-RUN apt-get update -y \
-						&& apt-get install lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 iproute2 libstdc++6 wget openjdk-17-jre maven -y
-
-# Install NodeJS
-RUN curl -sL https://deb.nodesource.com/setup_16.x -o /tmp/nodesource_setup.sh
-RUN bash /tmp/nodesource_setup.sh
-RUN apt install nodejs -y
\ No newline at end of file
diff --git a/gitea-runner/MavenDockerfile b/gitea-runner/MavenDockerfile
deleted file mode 100644
index 4f1f177..0000000
--- a/gitea-runner/MavenDockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM docker:stable
-
-# Install packages
-RUN apk add --no-cache curl wget git
-
-# Install Node 18
-RUN apk add nodejs npm --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/main --allow-untrusted
-
-# Install Maven
-RUN apk add maven
\ No newline at end of file
diff --git a/gitea-runner/NginxPHPDockerfile b/gitea-runner/NginxPHPDockerfile
deleted file mode 100644
index 0f106eb..0000000
--- a/gitea-runner/NginxPHPDockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM tangramor/nginx-php8-fpm
-
-# Install GD library
-RUN docker-php-ext-install gd