Merge branch 'master' of https://git.fascinated.cc/Fascinated/docker-images

.gitea/workflows/publish.yaml

@@ -1,9 +1,9 @@
-name: Publish
+Actions name: Publish
 
 on:
   push:
     branches:
-      - "**"
+      - "master"
 
 jobs:
   docker:
@@ -11,41 +11,57 @@ jobs:
       matrix:
         arch: ["ubuntu-latest"]
         git-version: ["2.38.4"]
+      max-parallel: 3
+      fail-fast: true
     runs-on: ${{ matrix.arch }}
     steps:
-      - name: checkout
+      - name: Checkout
-        uses: actions/checkout@v2
+        uses: https://github.com/actions/checkout@v3
-        with:
-          submodules: recursive
 
-      - name: Download docker
+      - name: Download Docker
         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/*          
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: https://github.com/docker/setup-buildx-action@v2
 
       - name: Login to Repo
-        uses: docker/login-action@v2
+        uses: https://github.com/docker/login-action@v2
         with:
-          registry: git.fascinated.cc
+          registry: git.rainnny.club
           username: ${{ secrets.REPO_USERNAME }}
           password: ${{ secrets.REPO_TOKEN }}
 
-      - name: Build and push (Node 18.x)
+      - name: Build and Push (Docker)
+        uses: docker/build-push-action@v4
+        with:
+          push: true
+          context: ./gitea-runner
+          file: ./gitea-runner/DockerDockerfile
+          tags: git.rainnny.club/rainnny/gitea-runner:docker
+
+      - name: Build and Push (Node 18.x)
         uses: docker/build-push-action@v4
         with:
           push: true
           context: ./gitea-runner
           file: ./gitea-runner/Node18xDockerfile
-          tags: git.fascinated.cc/fascinated/gitea-runner:node-18
+          tags: git.rainnny.club/rainnny/gitea-runner:node-18
 
-       - name: Build and push (Nginx PHP)
+      - name: Build and Push (Java 17)
-         uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v4
-         with:
+        with:
-           push: true
+          push: true
-           context: ./gitea-runner
+          context: ./gitea-runner
-           file: ./gitea-runner/NginxPHPDockerfile
+          file: ./gitea-runner/Java17Dockerfile
-           tags: git.fascinated.cc/fascinated/nginx-php:latest
+          tags: git.rainnny.club/rainnny/gitea-runner:java-17
+
+      - name: Build and Push (Java 18)
+        uses: docker/build-push-action@v4
+        with:
+          push: true
+          context: ./gitea-runner
+          file: ./gitea-runner/Java18Dockerfile
+          tags: git.rainnny.club/rainnny/gitea-runner:java-18

gitea-runner/NginxPHPDockerfile

@@ -1,4 +1,4 @@
 FROM tangramor/nginx-php8-fpm
 
 # Install GD library
-RUN docker-php-ext-install gd
+RUN docker-php-ext-install gd