diff --git a/.github/workflows/ci-master-pr.yml b/.github/workflows/ci-master-pr.yml index 811ca2f..534961a 100644 --- a/.github/workflows/ci-master-pr.yml +++ b/.github/workflows/ci-master-pr.yml @@ -1473,488 +1473,8 @@ jobs: rm -rf /tmp/.buildx-cache mv /tmp/.buildx-cache-new /tmp/.buildx-cache - build-3-8-curl-git-jq-ssh: - runs-on: ubuntu-latest - env: - VARIANT: 3.8-curl-git-jq-ssh - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Display system info (linux) - run: | - set -e - hostname - whoami - cat /etc/*release - lscpu - free - df -h - pwd - docker info - docker version - - # See: https://github.com/docker/build-push-action/blob/v2.6.1/docs/advanced/cache.md#github-cache - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v2 - - - name: Cache Docker layers - uses: actions/cache@v3 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ env.VARIANT }}-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT }}- - ${{ runner.os }}-buildx- - - # This step generates the docker tags - - name: Prepare - id: prep - run: | - set -e - - # Get ref, i.e. from refs/heads/, or from refs/tags/. E.g. 'master' or 'v0.0.0' - REF=$( echo "${GITHUB_REF}" | rev | cut -d '/' -f 1 | rev ) - - # Get short commit hash E.g. 'abc0123' - SHA=$( echo "${GITHUB_SHA}" | cut -c1-7 ) - - # Generate docker image tags - # E.g. 'v0.0.0-' and 'v0.0.0-abc0123-' - # E.g. 'master-' and 'master-abc0123-' - REF_VARIANT="${REF}-${VARIANT}" - REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}" - - # Pass variables to next step - echo "VARIANT_BUILD_DIR=$VARIANT_BUILD_DIR" >> $GITHUB_ENV - echo "VARIANT=$VARIANT" >> $GITHUB_ENV - echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_ENV - echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_ENV - - - name: Login to Docker Hub registry - # Run on master and tags - if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/') - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_REGISTRY_USER }} - password: ${{ secrets.DOCKERHUB_REGISTRY_PASSWORD }} - - - name: Build (PRs) - # Run only on pull requests - if: github.event_name == 'pull_request' - uses: docker/build-push-action@v3 - with: - context: variants/3.8-curl-git-jq-ssh - platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x - push: false - tags: | - ${{ github.repository }}:${{ env.REF_VARIANT }} - ${{ github.repository }}:${{ env.REF_SHA_VARIANT }} - cache-from: type=local,src=/tmp/.buildx-cache - cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - - name: Build and push (master) - # Run only on master - if: github.ref == 'refs/heads/master' - uses: docker/build-push-action@v3 - with: - context: variants/3.8-curl-git-jq-ssh - platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x - push: true - tags: | - ${{ github.repository }}:${{ env.REF_VARIANT }} - ${{ github.repository }}:${{ env.REF_SHA_VARIANT }} - cache-from: type=local,src=/tmp/.buildx-cache - cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - - name: Build and push (release) - if: startsWith(github.ref, 'refs/tags/') - uses: docker/build-push-action@v3 - with: - context: variants/3.8-curl-git-jq-ssh - platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x - push: true - tags: | - ${{ github.repository }}:${{ env.VARIANT }} - ${{ github.repository }}:${{ env.REF_VARIANT }} - ${{ github.repository }}:${{ env.REF_SHA_VARIANT }} - cache-from: type=local,src=/tmp/.buildx-cache - cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - # Temp fix - # https://github.com/docker/build-push-action/issues/252 - # https://github.com/moby/buildkit/issues/1896 - - name: Move cache - run: | - rm -rf /tmp/.buildx-cache - mv /tmp/.buildx-cache-new /tmp/.buildx-cache - - build-3-8-curl-mysqlclient-openssl: - runs-on: ubuntu-latest - env: - VARIANT: 3.8-curl-mysqlclient-openssl - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Display system info (linux) - run: | - set -e - hostname - whoami - cat /etc/*release - lscpu - free - df -h - pwd - docker info - docker version - - # See: https://github.com/docker/build-push-action/blob/v2.6.1/docs/advanced/cache.md#github-cache - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v2 - - - name: Cache Docker layers - uses: actions/cache@v3 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ env.VARIANT }}-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT }}- - ${{ runner.os }}-buildx- - - # This step generates the docker tags - - name: Prepare - id: prep - run: | - set -e - - # Get ref, i.e. from refs/heads/, or from refs/tags/. E.g. 'master' or 'v0.0.0' - REF=$( echo "${GITHUB_REF}" | rev | cut -d '/' -f 1 | rev ) - - # Get short commit hash E.g. 'abc0123' - SHA=$( echo "${GITHUB_SHA}" | cut -c1-7 ) - - # Generate docker image tags - # E.g. 'v0.0.0-' and 'v0.0.0-abc0123-' - # E.g. 'master-' and 'master-abc0123-' - REF_VARIANT="${REF}-${VARIANT}" - REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}" - - # Pass variables to next step - echo "VARIANT_BUILD_DIR=$VARIANT_BUILD_DIR" >> $GITHUB_ENV - echo "VARIANT=$VARIANT" >> $GITHUB_ENV - echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_ENV - echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_ENV - - - name: Login to Docker Hub registry - # Run on master and tags - if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/') - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_REGISTRY_USER }} - password: ${{ secrets.DOCKERHUB_REGISTRY_PASSWORD }} - - - name: Build (PRs) - # Run only on pull requests - if: github.event_name == 'pull_request' - uses: docker/build-push-action@v3 - with: - context: variants/3.8-curl-mysqlclient-openssl - platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x - push: false - tags: | - ${{ github.repository }}:${{ env.REF_VARIANT }} - ${{ github.repository }}:${{ env.REF_SHA_VARIANT }} - cache-from: type=local,src=/tmp/.buildx-cache - cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - - name: Build and push (master) - # Run only on master - if: github.ref == 'refs/heads/master' - uses: docker/build-push-action@v3 - with: - context: variants/3.8-curl-mysqlclient-openssl - platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x - push: true - tags: | - ${{ github.repository }}:${{ env.REF_VARIANT }} - ${{ github.repository }}:${{ env.REF_SHA_VARIANT }} - cache-from: type=local,src=/tmp/.buildx-cache - cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - - name: Build and push (release) - if: startsWith(github.ref, 'refs/tags/') - uses: docker/build-push-action@v3 - with: - context: variants/3.8-curl-mysqlclient-openssl - platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x - push: true - tags: | - ${{ github.repository }}:${{ env.VARIANT }} - ${{ github.repository }}:${{ env.REF_VARIANT }} - ${{ github.repository }}:${{ env.REF_SHA_VARIANT }} - cache-from: type=local,src=/tmp/.buildx-cache - cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - # Temp fix - # https://github.com/docker/build-push-action/issues/252 - # https://github.com/moby/buildkit/issues/1896 - - name: Move cache - run: | - rm -rf /tmp/.buildx-cache - mv /tmp/.buildx-cache-new /tmp/.buildx-cache - - build-3-8-iptables: - runs-on: ubuntu-latest - env: - VARIANT: 3.8-iptables - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Display system info (linux) - run: | - set -e - hostname - whoami - cat /etc/*release - lscpu - free - df -h - pwd - docker info - docker version - - # See: https://github.com/docker/build-push-action/blob/v2.6.1/docs/advanced/cache.md#github-cache - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v2 - - - name: Cache Docker layers - uses: actions/cache@v3 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ env.VARIANT }}-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT }}- - ${{ runner.os }}-buildx- - - # This step generates the docker tags - - name: Prepare - id: prep - run: | - set -e - - # Get ref, i.e. from refs/heads/, or from refs/tags/. E.g. 'master' or 'v0.0.0' - REF=$( echo "${GITHUB_REF}" | rev | cut -d '/' -f 1 | rev ) - - # Get short commit hash E.g. 'abc0123' - SHA=$( echo "${GITHUB_SHA}" | cut -c1-7 ) - - # Generate docker image tags - # E.g. 'v0.0.0-' and 'v0.0.0-abc0123-' - # E.g. 'master-' and 'master-abc0123-' - REF_VARIANT="${REF}-${VARIANT}" - REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}" - - # Pass variables to next step - echo "VARIANT_BUILD_DIR=$VARIANT_BUILD_DIR" >> $GITHUB_ENV - echo "VARIANT=$VARIANT" >> $GITHUB_ENV - echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_ENV - echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_ENV - - - name: Login to Docker Hub registry - # Run on master and tags - if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/') - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_REGISTRY_USER }} - password: ${{ secrets.DOCKERHUB_REGISTRY_PASSWORD }} - - - name: Build (PRs) - # Run only on pull requests - if: github.event_name == 'pull_request' - uses: docker/build-push-action@v3 - with: - context: variants/3.8-iptables - platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x - push: false - tags: | - ${{ github.repository }}:${{ env.REF_VARIANT }} - ${{ github.repository }}:${{ env.REF_SHA_VARIANT }} - cache-from: type=local,src=/tmp/.buildx-cache - cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - - name: Build and push (master) - # Run only on master - if: github.ref == 'refs/heads/master' - uses: docker/build-push-action@v3 - with: - context: variants/3.8-iptables - platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x - push: true - tags: | - ${{ github.repository }}:${{ env.REF_VARIANT }} - ${{ github.repository }}:${{ env.REF_SHA_VARIANT }} - cache-from: type=local,src=/tmp/.buildx-cache - cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - - name: Build and push (release) - if: startsWith(github.ref, 'refs/tags/') - uses: docker/build-push-action@v3 - with: - context: variants/3.8-iptables - platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x - push: true - tags: | - ${{ github.repository }}:${{ env.VARIANT }} - ${{ github.repository }}:${{ env.REF_VARIANT }} - ${{ github.repository }}:${{ env.REF_SHA_VARIANT }} - cache-from: type=local,src=/tmp/.buildx-cache - cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - # Temp fix - # https://github.com/docker/build-push-action/issues/252 - # https://github.com/moby/buildkit/issues/1896 - - name: Move cache - run: | - rm -rf /tmp/.buildx-cache - mv /tmp/.buildx-cache-new /tmp/.buildx-cache - - build-3-8-rsync: - runs-on: ubuntu-latest - env: - VARIANT: 3.8-rsync - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Display system info (linux) - run: | - set -e - hostname - whoami - cat /etc/*release - lscpu - free - df -h - pwd - docker info - docker version - - # See: https://github.com/docker/build-push-action/blob/v2.6.1/docs/advanced/cache.md#github-cache - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v2 - - - name: Cache Docker layers - uses: actions/cache@v3 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ env.VARIANT }}-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT }}- - ${{ runner.os }}-buildx- - - # This step generates the docker tags - - name: Prepare - id: prep - run: | - set -e - - # Get ref, i.e. from refs/heads/, or from refs/tags/. E.g. 'master' or 'v0.0.0' - REF=$( echo "${GITHUB_REF}" | rev | cut -d '/' -f 1 | rev ) - - # Get short commit hash E.g. 'abc0123' - SHA=$( echo "${GITHUB_SHA}" | cut -c1-7 ) - - # Generate docker image tags - # E.g. 'v0.0.0-' and 'v0.0.0-abc0123-' - # E.g. 'master-' and 'master-abc0123-' - REF_VARIANT="${REF}-${VARIANT}" - REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}" - - # Pass variables to next step - echo "VARIANT_BUILD_DIR=$VARIANT_BUILD_DIR" >> $GITHUB_ENV - echo "VARIANT=$VARIANT" >> $GITHUB_ENV - echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_ENV - echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_ENV - - - name: Login to Docker Hub registry - # Run on master and tags - if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/') - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_REGISTRY_USER }} - password: ${{ secrets.DOCKERHUB_REGISTRY_PASSWORD }} - - - name: Build (PRs) - # Run only on pull requests - if: github.event_name == 'pull_request' - uses: docker/build-push-action@v3 - with: - context: variants/3.8-rsync - platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x - push: false - tags: | - ${{ github.repository }}:${{ env.REF_VARIANT }} - ${{ github.repository }}:${{ env.REF_SHA_VARIANT }} - cache-from: type=local,src=/tmp/.buildx-cache - cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - - name: Build and push (master) - # Run only on master - if: github.ref == 'refs/heads/master' - uses: docker/build-push-action@v3 - with: - context: variants/3.8-rsync - platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x - push: true - tags: | - ${{ github.repository }}:${{ env.REF_VARIANT }} - ${{ github.repository }}:${{ env.REF_SHA_VARIANT }} - cache-from: type=local,src=/tmp/.buildx-cache - cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - - name: Build and push (release) - if: startsWith(github.ref, 'refs/tags/') - uses: docker/build-push-action@v3 - with: - context: variants/3.8-rsync - platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x - push: true - tags: | - ${{ github.repository }}:${{ env.VARIANT }} - ${{ github.repository }}:${{ env.REF_VARIANT }} - ${{ github.repository }}:${{ env.REF_SHA_VARIANT }} - cache-from: type=local,src=/tmp/.buildx-cache - cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - # Temp fix - # https://github.com/docker/build-push-action/issues/252 - # https://github.com/moby/buildkit/issues/1896 - - name: Move cache - run: | - rm -rf /tmp/.buildx-cache - mv /tmp/.buildx-cache-new /tmp/.buildx-cache - update-draft-release: - needs: [build-3-17-curl-git-jq-ssh, build-3-17-curl-mysqlclient-openssl, build-3-17-iptables, build-3-17-rsync, build-3-15-curl-git-jq-ssh, build-3-15-curl-mysqlclient-openssl, build-3-15-iptables, build-3-15-rsync, build-3-12-curl-git-jq-ssh, build-3-12-curl-mysqlclient-openssl, build-3-12-iptables, build-3-12-rsync, build-3-8-curl-git-jq-ssh, build-3-8-curl-mysqlclient-openssl, build-3-8-iptables, build-3-8-rsync] + needs: [build-3-17-curl-git-jq-ssh, build-3-17-curl-mysqlclient-openssl, build-3-17-iptables, build-3-17-rsync, build-3-15-curl-git-jq-ssh, build-3-15-curl-mysqlclient-openssl, build-3-15-iptables, build-3-15-rsync, build-3-12-curl-git-jq-ssh, build-3-12-curl-mysqlclient-openssl, build-3-12-iptables, build-3-12-rsync] if: github.ref == 'refs/heads/master' runs-on: ubuntu-latest steps: @@ -1967,7 +1487,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} publish-draft-release: - needs: [build-3-17-curl-git-jq-ssh, build-3-17-curl-mysqlclient-openssl, build-3-17-iptables, build-3-17-rsync, build-3-15-curl-git-jq-ssh, build-3-15-curl-mysqlclient-openssl, build-3-15-iptables, build-3-15-rsync, build-3-12-curl-git-jq-ssh, build-3-12-curl-mysqlclient-openssl, build-3-12-iptables, build-3-12-rsync, build-3-8-curl-git-jq-ssh, build-3-8-curl-mysqlclient-openssl, build-3-8-iptables, build-3-8-rsync] + needs: [build-3-17-curl-git-jq-ssh, build-3-17-curl-mysqlclient-openssl, build-3-17-iptables, build-3-17-rsync, build-3-15-curl-git-jq-ssh, build-3-15-curl-mysqlclient-openssl, build-3-15-iptables, build-3-15-rsync, build-3-12-curl-git-jq-ssh, build-3-12-curl-mysqlclient-openssl, build-3-12-iptables, build-3-12-rsync] if: startsWith(github.ref, 'refs/tags/') runs-on: ubuntu-latest steps: @@ -1982,7 +1502,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} update-dockerhub-description: - needs: [build-3-17-curl-git-jq-ssh, build-3-17-curl-mysqlclient-openssl, build-3-17-iptables, build-3-17-rsync, build-3-15-curl-git-jq-ssh, build-3-15-curl-mysqlclient-openssl, build-3-15-iptables, build-3-15-rsync, build-3-12-curl-git-jq-ssh, build-3-12-curl-mysqlclient-openssl, build-3-12-iptables, build-3-12-rsync, build-3-8-curl-git-jq-ssh, build-3-8-curl-mysqlclient-openssl, build-3-8-iptables, build-3-8-rsync] + needs: [build-3-17-curl-git-jq-ssh, build-3-17-curl-mysqlclient-openssl, build-3-17-iptables, build-3-17-rsync, build-3-15-curl-git-jq-ssh, build-3-15-curl-mysqlclient-openssl, build-3-15-iptables, build-3-15-rsync, build-3-12-curl-git-jq-ssh, build-3-12-curl-mysqlclient-openssl, build-3-12-iptables, build-3-12-rsync] if: github.ref == 'refs/heads/master' runs-on: ubuntu-latest steps: diff --git a/README.md b/README.md index 3ba4e0b..99b9318 100644 --- a/README.md +++ b/README.md @@ -22,10 +22,6 @@ Dockerized alpine with useful tools. | `:3.12-curl-mysqlclient-openssl` | [View](variants/3.12-curl-mysqlclient-openssl) | | `:3.12-iptables` | [View](variants/3.12-iptables) | | `:3.12-rsync` | [View](variants/3.12-rsync) | -| `:3.8-curl-git-jq-ssh` | [View](variants/3.8-curl-git-jq-ssh) | -| `:3.8-curl-mysqlclient-openssl` | [View](variants/3.8-curl-mysqlclient-openssl) | -| `:3.8-iptables` | [View](variants/3.8-iptables) | -| `:3.8-rsync` | [View](variants/3.8-rsync) | ## Development diff --git a/generate/definitions/VARIANTS.ps1 b/generate/definitions/VARIANTS.ps1 index eaaa539..0cfc232 100644 --- a/generate/definitions/VARIANTS.ps1 +++ b/generate/definitions/VARIANTS.ps1 @@ -2,7 +2,6 @@ $local:VARIANTS_DISTRO_VERSIONS = @( '3.17' '3.15' '3.12' - '3.8' ) # Docker image variants' definitions $local:VARIANTS_MATRIX = @(