Refactor lots of things

- php images are now contained under one name, with tags differentiating between the fpm, cli, and (future) dev versions
- there is now a way to define tag aliases for images, so refactored the “latest” tag implementation to take advantage of that
- removed uid and gid declarations from the php and node images, because those are useless in prebuilt images (will be built in to the individual spark boilerplates instead)
- added some necessary files for testing action workflows locally with “act”

.github/workflows/generic.yml

@@ -5,12 +5,11 @@ on:
       image-name:
         required: true
         type: string
-      latest:
-        required: true
-        type: string
       filters:
         required: true
         type: string
+      aliases:
+        type: string
     secrets:
       DOCKERHUB_USERNAME:
         required: true
@@ -46,32 +45,59 @@ jobs:
       - name: Checkout the repository
         uses: actions/checkout@v4
       - name: Get version number
-        uses: mad9000/actions-find-and-replace-string@2
+        uses: mad9000/actions-find-and-replace-string@bce4d50390d08b67e1822bd72fb54b3cf11b0ce9
         id: version
         with:
           source: ${{ matrix.version }}
           find: "${{ inputs.image-name }}-"
           replace: ""
       - name: Set up QEMU
+        if: ${{ !env.ACT }}
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
+        if: ${{ !env.ACT }}
         uses: docker/setup-buildx-action@v3
         with:
           install: true
+      - name: Get alias tags
+        id: get-tags
+        uses: mikefarah/yq@v4
+        with:
+          cmd: echo "${{ inputs.aliases }}" | yq '.["${{ inputs.image-name }}-${{ steps.version.outputs.value }}"] | map(. | tostring)' -o=json
+      - name: Generate dynamic tags
+        id: generate-tags
+        run: |
+          readarray -t tags <<< "$(echo '${{ steps.get-tags.outputs.result }}' | jq -r '.[]?')"
+          TAGS="type=raw,value=${{ steps.version.outputs.value }},enable=true,priority=200"
+          for tag in "${tags[@]}"; do
+            if [[ -z "$tag" ]]; then
+              continue
+            fi
+            if [[ "$tag" == "latest" ]]; then
+              priority=1000
+            elif [[ "$tag" == latest-* ]]; then
+              priority=900
+            else
+              priority=200
+            fi
+            TAGS="$TAGS\ntype=raw,value=${tag},enable=true,priority=$priority"
+          done
+          echo "::set-output name=tags::$TAGS"
       - name: Generate Docker meta
+        if: ${{ !env.ACT }}
         id: meta
         uses: docker/metadata-action@v5
         with:
           images: jalendport/spark-${{ inputs.image-name }}
-          tags: |
-            type=raw,value=${{ steps.version.outputs.value }},enable=true,priority=${{ steps.version.outputs.value }}
-            type=raw,value=latest,enable=${{ steps.version.outputs.value == inputs.latest }},priority=10000
+          tags: ${{ steps.generate-tags.outputs.tags }}
       - name: Log in to Docker Hub
+        if: ${{ !env.ACT }}
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push Docker image
+        if: ${{ !env.ACT }}
         uses: docker/build-push-action@v5
         with:
           context: ${{ inputs.image-name }}/${{ steps.version.outputs.value }}
@@ -80,6 +106,7 @@ jobs:
           platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta.outputs.tags }}
       - name: Update Docker image description
+        if: ${{ !env.ACT }}
         uses: peter-evans/dockerhub-description@v4
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}

.github/workflows/mysql-images.yml

@@ -13,7 +13,6 @@ jobs:
     uses: ./.github/workflows/generic.yml
     with:
       image-name: "mysql"
-      latest: "8.4"
       filters: |
         shared: &shared
           - mysql/README.md
@@ -25,4 +24,7 @@ jobs:
         mysql-8.4:
           - mysql/8.4/**
           - *shared
+      aliases: |
+        mysql-8.4:
+          - latest
     secrets: inherit

.github/workflows/nginx-images.yml

@@ -13,7 +13,6 @@ jobs:
     uses: ./.github/workflows/generic.yml
     with:
       image-name: "nginx"
-      latest: "1.26"
       filters: |
         shared: &shared
           - nginx/README.md
@@ -22,4 +21,7 @@ jobs:
         nginx-1.26:
           - nginx/1.26/**
           - *shared
+      aliases: |
+        nginx-1.26:
+          - latest
     secrets: inherit

.github/workflows/node-images.yml

@@ -31,4 +31,7 @@ jobs:
         node-22:
           - node/22/**
           - *shared
+      aliases: |
+        node-22:
+          - latest
     secrets: inherit

.github/workflows/php-images.yml

@@ -13,25 +13,54 @@ jobs:
     uses: ./.github/workflows/generic.yml
     with:
       image-name: "php"
-      latest: "8.3"
       filters: |
         shared: &shared
           - php/README.md
           - .github/workflows/php-images.yml
           - .github/workflows/generic.yml
-        php-7.4:
-          - php/7.4/**
+        php-7.4-cli:
+          - php/7.4-cli/**
           - *shared
-        php-8.0:
-          - php/8.0/**
+        php-7.4-fpm:
+          - php/7.4-fpm/**
           - *shared
-        php-8.1:
-          - php/8.1/**
+        php-8.0-cli:
+          - php/8.0.cli/**
           - *shared
-        php-8.2:
-          - php/8.2/**
+        php-8.0-fpm:
+          - php/8.0-fpm/**
           - *shared
-        php-8.3:
-          - php/8.3/**
+        php-8.1-cli:
+          - php/8.1-cli/**
           - *shared
+        php-8.1-fpm:
+          - php/8.1-fpm/**
+          - *shared
+        php-8.2-cli:
+          - php/8.2-cli/**
+          - *shared
+        php-8.2-fpm:
+          - php/8.2-fpm/**
+          - *shared
+        php-8.3-cli:
+          - php/8.3-cli/**
+          - *shared
+        php-8.3-fpm:
+          - php/8.3-fpm/**
+          - *shared
+      aliases: |
+        php-7.4-cli:
+          - 7.4
+        php-8.0-cli:
+          - 8.0
+        php-8.1-cli:
+          - 8.1
+        php-8.2-cli:
+          - 8.2
+        php-8.3-cli:
+          - 8.3
+          - latest
+          - latest-cli
+        php-8.3-fpm:
+          - latest-fpm
     secrets: inherit

.github/workflows/redis-images.yml

@@ -13,7 +13,6 @@ jobs:
     uses: ./.github/workflows/generic.yml
     with:
       image-name: "redis"
-      latest: "7.2"
       filters: |
         shared: &shared
           - redis/README.md
@@ -22,4 +21,7 @@ jobs:
         redis-7.2:
           - redis/7.2/**
           - *shared
+      aliases: |
+        redis-7.2:
+          - latest
     secrets: inherit

event.json

@@ -0,0 +1,6 @@
+{
+	"act": true,
+	"repository": {
+		"default_branch": "master"
+	}
+}

node/16/Dockerfile

@@ -1,11 +1,5 @@
 FROM node:16-alpine
 
-ARG UID
-ARG GID
-
-ENV UID=${UID:-1000}
-ENV GID=${GID:-1000}
-
 RUN mkdir -p /app
 RUN mkdir -p /app-tmp
 
@@ -14,16 +8,6 @@ WORKDIR /app
 COPY ./npm_install.sh /app-tmp/npm_install.sh
 RUN chmod a+x /app-tmp/npm_install.sh
 
-# MacOS staff group's gid is 20; so is the dialout group in alpine linux. We're not using it so let's just remove it.
-RUN delgroup dialout
-
-RUN deluser node
-
-RUN addgroup -g ${GID} --system spark
-RUN adduser -G spark --system -D -s /bin/sh -u ${UID} spark
-
-USER spark
-
 CMD /app-tmp/npm_install.sh \
 	&& \
 	npm run dev

node/18/Dockerfile

@@ -1,11 +1,5 @@
 FROM node:18-alpine
 
-ARG UID
-ARG GID
-
-ENV UID=${UID:-1000}
-ENV GID=${GID:-1000}
-
 RUN mkdir -p /app
 RUN mkdir -p /app-tmp
 
@@ -14,16 +8,6 @@ WORKDIR /app
 COPY ./npm_install.sh /app-tmp/npm_install.sh
 RUN chmod a+x /app-tmp/npm_install.sh
 
-# MacOS staff group's gid is 20; so is the dialout group in alpine linux. We're not using it so let's just remove it.
-RUN delgroup dialout
-
-RUN deluser node
-
-RUN addgroup -g ${GID} --system spark
-RUN adduser -G spark --system -D -s /bin/sh -u ${UID} spark
-
-USER spark
-
 CMD /app-tmp/npm_install.sh \
 	&& \
 	npm run dev

node/20/Dockerfile

@@ -1,11 +1,5 @@
 FROM node:20-alpine
 
-ARG UID
-ARG GID
-
-ENV UID=${UID:-1000}
-ENV GID=${GID:-1000}
-
 RUN mkdir -p /app
 RUN mkdir -p /app-tmp
 
@@ -14,16 +8,6 @@ WORKDIR /app
 COPY ./npm_install.sh /app-tmp/npm_install.sh
 RUN chmod a+x /app-tmp/npm_install.sh
 
-# MacOS staff group's gid is 20; so is the dialout group in alpine linux. We're not using it so let's just remove it.
-RUN delgroup dialout
-
-RUN deluser node
-
-RUN addgroup -g ${GID} --system spark
-RUN adduser -G spark --system -D -s /bin/sh -u ${UID} spark
-
-USER spark
-
 CMD /app-tmp/npm_install.sh \
 	&& \
 	npm run dev

node/22/Dockerfile

@@ -1,11 +1,5 @@
 FROM node:22-alpine
 
-ARG UID
-ARG GID
-
-ENV UID=${UID:-1000}
-ENV GID=${GID:-1000}
-
 RUN mkdir -p /app
 RUN mkdir -p /app-tmp
 
@@ -14,16 +8,6 @@ WORKDIR /app
 COPY ./npm_install.sh /app-tmp/npm_install.sh
 RUN chmod a+x /app-tmp/npm_install.sh
 
-# MacOS staff group's gid is 20; so is the dialout group in alpine linux. We're not using it so let's just remove it.
-RUN delgroup dialout
-
-RUN deluser node
-
-RUN addgroup -g ${GID} --system spark
-RUN adduser -G spark --system -D -s /bin/sh -u ${UID} spark
-
-USER spark
-
 CMD /app-tmp/npm_install.sh \
 	&& \
 	npm run dev