carlossg · carlossg · May 31, 2022 · May 31, 2022 · May 31, 2022
diff --git a/.github/workflows/eclipse-temurin-11-focal.yml b/.github/workflows/eclipse-temurin-11-focal.yml
@@ -0,0 +1,28 @@
+name: eclipse-temurin-11-focal
+
+on:
+  push:
+    paths:
+      - "eclipse-temurin-11-focal/**"
+      - .github/workflows/eclipse-temurin-11-focal.yml
+      - common.sh
+      - tags-for-dir.sh
+      - "tests/**"
+      - "!tests/*.ps*"
+      - "!tests/*.windows"
+  pull_request:
+    paths:
+      - "eclipse-temurin-11-focal/**"
+      - .github/workflows/eclipse-temurin-11-focal.yml
+      - common.sh
+      - tags-for-dir.sh
+      - "tests/**"
+      - "!tests/*.ps*"
+      - "!tests/*.windows"
+
+jobs:
+  build:
+    uses: ./.github/workflows/_template.yml
+    with:
+      directory: eclipse-temurin-11-focal
+    secrets: inherit
diff --git a/.github/workflows/eclipse-temurin-17-focal.yml b/.github/workflows/eclipse-temurin-17-focal.yml
@@ -0,0 +1,28 @@
+name: eclipse-temurin-17-focal
+
+on:
+  push:
+    paths:
+      - "eclipse-temurin-17-focal/**"
+      - .github/workflows/eclipse-temurin-17-focal.yml
+      - common.sh
+      - tags-for-dir.sh
+      - "tests/**"
+      - "!tests/*.ps*"
+      - "!tests/*.windows"
+  pull_request:
+    paths:
+      - "eclipse-temurin-17-focal/**"
+      - .github/workflows/eclipse-temurin-17-focal.yml
+      - common.sh
+      - tags-for-dir.sh
+      - "tests/**"
+      - "!tests/*.ps*"
+      - "!tests/*.windows"
+
+jobs:
+  build:
+    uses: ./.github/workflows/_template.yml
+    with:
+      directory: eclipse-temurin-17-focal
+    secrets: inherit
diff --git a/.github/workflows/eclipse-temurin-8-focal.yml b/.github/workflows/eclipse-temurin-8-focal.yml
@@ -0,0 +1,28 @@
+name: eclipse-temurin-8-focal
+
+on:
+  push:
+    paths:
+      - "eclipse-temurin-8-focal/**"
+      - .github/workflows/eclipse-temurin-8-focal.yml
+      - common.sh
+      - tags-for-dir.sh
+      - "tests/**"
+      - "!tests/*.ps*"
+      - "!tests/*.windows"
+  pull_request:
+    paths:
+      - "eclipse-temurin-8-focal/**"
+      - .github/workflows/eclipse-temurin-8-focal.yml
+      - common.sh
+      - tags-for-dir.sh
+      - "tests/**"
+      - "!tests/*.ps*"
+      - "!tests/*.windows"
+
+jobs:
+  build:
+    uses: ./.github/workflows/_template.yml
+    with:
+      directory: eclipse-temurin-8-focal
+    secrets: inherit
diff --git a/.github/workflows/libericaopenjdk-17-alpine.yml b/.github/workflows/libericaopenjdk-17-alpine.yml
@@ -20,121 +20,9 @@ on:
       - "!tests/*.ps*"
       - "!tests/*.windows"
 
-env:
-  # Use docker.io for Docker Hub if empty
-  REGISTRY: ghcr.io
-  REGISTRY2: docker.io
-  # github.repository as <account>/<repo>
-  DOCKER_USERNAME: csanchez
-  IMAGE_NAME: carlossg/maven # ${{ github.repository }}
-  IMAGE_NAME2: csanchez/maven
-
 jobs:
   build:
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: read
-      packages: write
-      # This is used to complete the identity challenge
-      # with sigstore/fulcio when running outside of PRs.
-      id-token: write
-
-    steps:
-      - name: Setup BATS
-        uses: mig4/[email protected]
-      - name: Check out code
-        uses: actions/checkout@v2
-      - name: Update submodules
-        run: git submodule update --init
-
-      # Signing based on https://github.com/actions/starter-workflows/blob/main/ci/docker-publish.yml
-
-      # Install the cosign tool except on PR
-      # https://github.com/sigstore/cosign-installer
-      - name: Install cosign
-        if: github.event_name != 'pull_request'
-        uses: sigstore/cosign-installer@main
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Test
-        run: bats tests
-        env:
-          TAG: libericaopenjdk-17-alpine
-
-      # Login against a Docker registry except on PR
-      # https://github.com/docker/login-action
-      - name: Log into registry GHCR
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.CR_PAT }}
-      - name: Log into registry DockerHub
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
-        with:
-          registry: ${{ env.REGISTRY2 }}
-          username: ${{ env.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      # Extract metadata (tags, labels) for Docker
-      # https://github.com/docker/metadata-action
-      - name: Extract Docker metadata
-        id: meta
-        uses: docker/[email protected]
-        with:
-          tags: |
-            type=schedule,suffix=-libericaopenjdk-17-alpine
-            type=ref,event=tag,suffix=-libericaopenjdk-17-alpine
-            type=ref,event=pr,prefix=pr-,suffix=-libericaopenjdk-17-alpine
-          images: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-            ${{ env.IMAGE_NAME2 }}
-
-      # get all the docker tags for this image when building master
-      - name: Retrieve tags
-        if: github.ref == 'refs/heads/master'
-        run: |
-          TAGS="$(./tags-for-dir.sh ${GITHUB_WORKFLOW})"
-          TAGS="${TAGS//'%'/'%25'}"
-          TAGS="${TAGS//$'\n'/'%0A'}"
-          TAGS="${TAGS//$'\r'/'%0D'}"
-          echo "::set-output name=tags::$TAGS"
-        id: retrieve-tags
-
-      # Build and push Docker image with Buildx (don't push on PR)
-      # https://github.com/docker/build-push-action
-      - name: Build and push Docker image
-        id: build-and-push
-        uses: docker/build-push-action@v2
-        with:
-          context: libericaopenjdk-17-alpine
-          push: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/master' }}
-          tags: |
-            ${{ steps.meta.outputs.tags }}
-            ${{ steps.retrieve-tags.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-      # Sign the resulting Docker image digest except on PRs and private repos
-      # The keyless signing process records signatures on the Rekor public
-      # transparency log, so signing is disabled for private repos by default
-      # to avoid leaking private data.  If you wish to sign things anyways,
-      # then this check can be removed and --force can be added to the cosign
-      # command below.
-      # https://github.com/sigstore/cosign
-      - name: Sign the published Docker images
-        if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/master' && !github.event.repository.private }}
-        env:
-          REGISTRY1: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ steps.build-and-push.outputs.digest }}
-          REGISTRY2: ${{ env.REGISTRY2 }}/${{ env.IMAGE_NAME2 }}@${{ steps.build-and-push.outputs.digest }}
-          COSIGN_EXPERIMENTAL: "true"
-        # This step uses the identity token to provision an ephemeral certificate
-        # against the sigstore community Fulcio instance, and records it to the
-        # sigstore community Rekor transparency log.
-        run: cosign sign --force ${REGISTRY1} ${REGISTRY2}
+    uses: ./.github/workflows/_template.yml
+    with:
+      directory: libericaopenjdk-17-alpine
+    secrets: inherit
diff --git a/.github/workflows/libericaopenjdk-17.yml b/.github/workflows/libericaopenjdk-17.yml
@@ -20,121 +20,9 @@ on:
       - "!tests/*.ps*"
       - "!tests/*.windows"
 
-env:
-  # Use docker.io for Docker Hub if empty
-  REGISTRY: ghcr.io
-  REGISTRY2: docker.io
-  # github.repository as <account>/<repo>
-  DOCKER_USERNAME: csanchez
-  IMAGE_NAME: carlossg/maven # ${{ github.repository }}
-  IMAGE_NAME2: csanchez/maven
-
 jobs:
   build:
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: read
-      packages: write
-      # This is used to complete the identity challenge
-      # with sigstore/fulcio when running outside of PRs.
-      id-token: write
-
-    steps:
-      - name: Setup BATS
-        uses: mig4/[email protected]
-      - name: Check out code
-        uses: actions/checkout@v2
-      - name: Update submodules
-        run: git submodule update --init
-
-      # Signing based on https://github.com/actions/starter-workflows/blob/main/ci/docker-publish.yml
-
-      # Install the cosign tool except on PR
-      # https://github.com/sigstore/cosign-installer
-      - name: Install cosign
-        if: github.event_name != 'pull_request'
-        uses: sigstore/cosign-installer@main
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Test
-        run: bats tests
-        env:
-          TAG: libericaopenjdk-17
-
-      # Login against a Docker registry except on PR
-      # https://github.com/docker/login-action
-      - name: Log into registry GHCR
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.CR_PAT }}
-      - name: Log into registry DockerHub
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
-        with:
-          registry: ${{ env.REGISTRY2 }}
-          username: ${{ env.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      # Extract metadata (tags, labels) for Docker
-      # https://github.com/docker/metadata-action
-      - name: Extract Docker metadata
-        id: meta
-        uses: docker/[email protected]
-        with:
-          tags: |
-            type=schedule,suffix=-libericaopenjdk-17
-            type=ref,event=tag,suffix=-libericaopenjdk-17
-            type=ref,event=pr,prefix=pr-,suffix=-libericaopenjdk-17
-          images: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-            ${{ env.IMAGE_NAME2 }}
-
-      # get all the docker tags for this image when building master
-      - name: Retrieve tags
-        if: github.ref == 'refs/heads/master'
-        run: |
-          TAGS="$(./tags-for-dir.sh ${GITHUB_WORKFLOW})"
-          TAGS="${TAGS//'%'/'%25'}"
-          TAGS="${TAGS//$'\n'/'%0A'}"
-          TAGS="${TAGS//$'\r'/'%0D'}"
-          echo "::set-output name=tags::$TAGS"
-        id: retrieve-tags
-
-      # Build and push Docker image with Buildx (don't push on PR)
-      # https://github.com/docker/build-push-action
-      - name: Build and push Docker image
-        id: build-and-push
-        uses: docker/build-push-action@v2
-        with:
-          context: libericaopenjdk-17
-          push: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/master' }}
-          tags: |
-            ${{ steps.meta.outputs.tags }}
-            ${{ steps.retrieve-tags.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-      # Sign the resulting Docker image digest except on PRs and private repos
-      # The keyless signing process records signatures on the Rekor public
-      # transparency log, so signing is disabled for private repos by default
-      # to avoid leaking private data.  If you wish to sign things anyways,
-      # then this check can be removed and --force can be added to the cosign
-      # command below.
-      # https://github.com/sigstore/cosign
-      - name: Sign the published Docker images
-        if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/master' && !github.event.repository.private }}
-        env:
-          REGISTRY1: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ steps.build-and-push.outputs.digest }}
-          REGISTRY2: ${{ env.REGISTRY2 }}/${{ env.IMAGE_NAME2 }}@${{ steps.build-and-push.outputs.digest }}
-          COSIGN_EXPERIMENTAL: "true"
-        # This step uses the identity token to provision an ephemeral certificate
-        # against the sigstore community Fulcio instance, and records it to the
-        # sigstore community Rekor transparency log.
-        run: cosign sign --force ${REGISTRY1} ${REGISTRY2}
+    uses: ./.github/workflows/_template.yml
+    with:
+      directory: libericaopenjdk-17
+    secrets: inherit
diff --git a/.github/workflows/other.yml b/.github/workflows/other.yml
@@ -19,12 +19,15 @@ on:
       - '!common.sh/**'
       - '!eclipse-temurin-11/**'
       - '!eclipse-temurin-11-alpine/**'
+      - '!eclipse-temurin-11-focal/**'
       - '!eclipse-temurin-17/**'
       - '!eclipse-temurin-17-alpine/**'
+      - '!eclipse-temurin-17-focal/**'
       - '!eclipse-temurin-18/**'
       - '!eclipse-temurin-18-alpine/**'
       - '!eclipse-temurin-8/**'
       - '!eclipse-temurin-8-alpine/**'
+      - '!eclipse-temurin-8-focal/**'
       - '!generate-stackbrew-library.sh/**'
       - '!github-action-generation.sh/**'
       - '!github-action.ps1/**'
@@ -77,12 +80,15 @@ on:
       - '!common.sh/**'
       - '!eclipse-temurin-11/**'
       - '!eclipse-temurin-11-alpine/**'
+      - '!eclipse-temurin-11-focal/**'
       - '!eclipse-temurin-17/**'
       - '!eclipse-temurin-17-alpine/**'
+      - '!eclipse-temurin-17-focal/**'
       - '!eclipse-temurin-18/**'
       - '!eclipse-temurin-18-alpine/**'
       - '!eclipse-temurin-8/**'
       - '!eclipse-temurin-8-alpine/**'
+      - '!eclipse-temurin-8-focal/**'
       - '!generate-stackbrew-library.sh/**'
       - '!github-action-generation.sh/**'
       - '!github-action.ps1/**'

diff --git a/README.md b/README.md
@@ -23,12 +23,15 @@ See Docker Hub or GitHub Container Registry for an updated list of tags
 * [openjdk-18-slim](https://github.com/carlossg/docker-maven/blob/master/openjdk-17-slim/Dockerfile)
 * [eclipse-temurin-8](https://github.com/carlossg/docker-maven/blob/master/eclipse-temurin-8/Dockerfile)
 * [eclipse-temurin-8-alpine](https://github.com/carlossg/docker-maven/blob/master/eclipse-temurin-8-alpine/Dockerfile)
+* [eclipse-temurin-8-focal](https://github.com/carlossg/docker-maven/blob/master/eclipse-temurin-8-focal/Dockerfile)
 * [eclipse-temurin-11](https://github.com/carlossg/docker-maven/blob/master/eclipse-temurin-11/Dockerfile)
 * [eclipse-temurin-11-alpine](https://github.com/carlossg/docker-maven/blob/master/eclipse-temurin-11-alpine/Dockerfile)
+* [eclipse-temurin-11-focal](https://github.com/carlossg/docker-maven/blob/master/eclipse-temurin-11-focal/Dockerfile)
 * [eclipse-temurin-16](https://github.com/carlossg/docker-maven/blob/master/eclipse-temurin-16/Dockerfile)
 * [eclipse-temurin-16-alpine](https://github.com/carlossg/docker-maven/blob/master/eclipse-temurin-16-alpine/Dockerfile)
 * [eclipse-temurin-17](https://github.com/carlossg/docker-maven/blob/master/eclipse-temurin-17/Dockerfile)
 * [eclipse-temurin-17-alpine](https://github.com/carlossg/docker-maven/blob/master/eclipse-temurin-17-alpine/Dockerfile)
+* [eclipse-temurin-17-focal](https://github.com/carlossg/docker-maven/blob/master/eclipse-temurin-17-focal/Dockerfile)
 * [eclipse-temurin-18](https://github.com/carlossg/docker-maven/blob/master/eclipse-temurin-18/Dockerfile)
 * [eclipse-temurin-18-alpine](https://github.com/carlossg/docker-maven/blob/master/eclipse-temurin-18-alpine/Dockerfile)
 * [ibm-semeru-11-focal](https://github.com/carlossg/docker-maven/blob/master/ibm-semeru-11-focal/Dockerfile)