diff --git a/.github/workflows/ci-master-pr.yml b/.github/workflows/ci-master-pr.yml index 674d41a..7ba2122 100644 --- a/.github/workflows/ci-master-pr.yml +++ b/.github/workflows/ci-master-pr.yml @@ -79,7 +79,7 @@ jobs: # This step generates the docker tags - name: Prepare - id: prep-7-4-alpine-3-17 + id: prep-7-4-alpine-3-20 run: | set -e @@ -92,7 +92,7 @@ jobs: # Generate docker image tags # E.g. 'v0.0.0-' and 'v0.0.0-abc0123-' # E.g. 'master-' and 'master-abc0123-' - VARIANT="7.4-alpine-3.17" + VARIANT="7.4-alpine-3.20" REF_VARIANT="${REF}-${VARIANT}" REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}" @@ -102,51 +102,51 @@ jobs: echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT - - name: 7.4-alpine-3.17 - Build (PRs) + - name: 7.4-alpine-3.20 - Build (PRs) # Run only on pull requests if: github.event_name == 'pull_request' uses: docker/build-push-action@v5 with: - context: variants/7.4-alpine-3.17 + context: variants/7.4-alpine-3.20 platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: false tags: | - ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-17.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-17.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-20.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-20.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 7.4-alpine-3.17 - Build and push (master) + - name: 7.4-alpine-3.20 - Build and push (master) # Run only on master if: github.ref == 'refs/heads/master' uses: docker/build-push-action@v5 with: - context: variants/7.4-alpine-3.17 + context: variants/7.4-alpine-3.20 platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-17.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-17.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-20.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-20.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 7.4-alpine-3.17 - Build and push (release) + - name: 7.4-alpine-3.20 - Build and push (release) if: startsWith(github.ref, 'refs/tags/') uses: docker/build-push-action@v5 with: - context: variants/7.4-alpine-3.17 + context: variants/7.4-alpine-3.20 platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-17.outputs.VARIANT }} - ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-17.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-17.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-20.outputs.VARIANT }} + ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-20.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-20.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max # This step generates the docker tags - name: Prepare - id: prep-7-4-alpine-3-17-git + id: prep-7-4-alpine-3-20-git run: | set -e @@ -159,7 +159,7 @@ jobs: # Generate docker image tags # E.g. 'v0.0.0-' and 'v0.0.0-abc0123-' # E.g. 'master-' and 'master-abc0123-' - VARIANT="7.4-alpine-3.17-git" + VARIANT="7.4-alpine-3.20-git" REF_VARIANT="${REF}-${VARIANT}" REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}" @@ -169,51 +169,51 @@ jobs: echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT - - name: 7.4-alpine-3.17-git - Build (PRs) + - name: 7.4-alpine-3.20-git - Build (PRs) # Run only on pull requests if: github.event_name == 'pull_request' uses: docker/build-push-action@v5 with: - context: variants/7.4-alpine-3.17-git + context: variants/7.4-alpine-3.20-git platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: false tags: | - ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-17-git.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-17-git.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-20-git.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-20-git.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 7.4-alpine-3.17-git - Build and push (master) + - name: 7.4-alpine-3.20-git - Build and push (master) # Run only on master if: github.ref == 'refs/heads/master' uses: docker/build-push-action@v5 with: - context: variants/7.4-alpine-3.17-git + context: variants/7.4-alpine-3.20-git platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-17-git.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-17-git.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-20-git.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-20-git.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 7.4-alpine-3.17-git - Build and push (release) + - name: 7.4-alpine-3.20-git - Build and push (release) if: startsWith(github.ref, 'refs/tags/') uses: docker/build-push-action@v5 with: - context: variants/7.4-alpine-3.17-git + context: variants/7.4-alpine-3.20-git platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-17-git.outputs.VARIANT }} - ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-17-git.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-17-git.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-20-git.outputs.VARIANT }} + ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-20-git.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-20-git.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max # This step generates the docker tags - name: Prepare - id: prep-7-4-alpine-3-17-git-sops + id: prep-7-4-alpine-3-20-git-sops run: | set -e @@ -226,7 +226,7 @@ jobs: # Generate docker image tags # E.g. 'v0.0.0-' and 'v0.0.0-abc0123-' # E.g. 'master-' and 'master-abc0123-' - VARIANT="7.4-alpine-3.17-git-sops" + VARIANT="7.4-alpine-3.20-git-sops" REF_VARIANT="${REF}-${VARIANT}" REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}" @@ -236,45 +236,45 @@ jobs: echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT - - name: 7.4-alpine-3.17-git-sops - Build (PRs) + - name: 7.4-alpine-3.20-git-sops - Build (PRs) # Run only on pull requests if: github.event_name == 'pull_request' uses: docker/build-push-action@v5 with: - context: variants/7.4-alpine-3.17-git-sops + context: variants/7.4-alpine-3.20-git-sops platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: false tags: | - ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-17-git-sops.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-17-git-sops.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-20-git-sops.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-20-git-sops.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 7.4-alpine-3.17-git-sops - Build and push (master) + - name: 7.4-alpine-3.20-git-sops - Build and push (master) # Run only on master if: github.ref == 'refs/heads/master' uses: docker/build-push-action@v5 with: - context: variants/7.4-alpine-3.17-git-sops + context: variants/7.4-alpine-3.20-git-sops platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-17-git-sops.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-17-git-sops.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-20-git-sops.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-20-git-sops.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 7.4-alpine-3.17-git-sops - Build and push (release) + - name: 7.4-alpine-3.20-git-sops - Build and push (release) if: startsWith(github.ref, 'refs/tags/') uses: docker/build-push-action@v5 with: - context: variants/7.4-alpine-3.17-git-sops + context: variants/7.4-alpine-3.20-git-sops platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-17-git-sops.outputs.VARIANT }} - ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-17-git-sops.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-17-git-sops.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-20-git-sops.outputs.VARIANT }} + ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-20-git-sops.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-7-4-alpine-3-20-git-sops.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max diff --git a/README.md b/README.md index 70ba3a2..b98c777 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,9 @@ Dockerized `powershell`, based on [mcr.microsoft.com/powershell](https://hub.doc | Tag | Dockerfile Build Context | |:-------:|:---------:| -| `:7.4-alpine-3.17` | [View](variants/7.4-alpine-3.17) | -| `:7.4-alpine-3.17-git` | [View](variants/7.4-alpine-3.17-git) | -| `:7.4-alpine-3.17-git-sops` | [View](variants/7.4-alpine-3.17-git-sops) | +| `:7.4-alpine-3.20` | [View](variants/7.4-alpine-3.20) | +| `:7.4-alpine-3.20-git` | [View](variants/7.4-alpine-3.20-git) | +| `:7.4-alpine-3.20-git-sops` | [View](variants/7.4-alpine-3.20-git-sops) | | `:7.3-alpine-3.17` | [View](variants/7.3-alpine-3.17) | | `:7.3-alpine-3.17-git` | [View](variants/7.3-alpine-3.17-git) | | `:7.3-alpine-3.17-git-sops` | [View](variants/7.3-alpine-3.17-git-sops) | diff --git a/generate/definitions/versions.json b/generate/definitions/versions.json index 17d8507..5f0b302 100644 --- a/generate/definitions/versions.json +++ b/generate/definitions/versions.json @@ -1,6 +1,7 @@ { "pwsh": { "versions": [ + "7.5.0", "7.4.6", "7.3.12", "7.2.24" diff --git a/variants/7.4-alpine-3.20-git-sops/Dockerfile b/variants/7.4-alpine-3.20-git-sops/Dockerfile new file mode 100644 index 0000000..fd7917a --- /dev/null +++ b/variants/7.4-alpine-3.20-git-sops/Dockerfile @@ -0,0 +1,28 @@ +FROM mcr.microsoft.com/powershell:7.4-alpine-3.20 + +# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350 +ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_UPDATECHECK=Off +ENV POWERSHELL_UPDATECHECK_OPTOUT=1 +ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 +ENV DOTNET_TELEMETRY_OPTOUT=1 +ENV COMPlus_EnableDiagnostics=0 + +# Install Pester +RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose' + +RUN apk add --no-cache git + +RUN set -eux; \ + wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.3/sops-v3.7.3.linux > /usr/local/bin/sops; \ + chmod +x /usr/local/bin/sops; \ + sha256sum /usr/local/bin/sops | grep '^53aec65e45f62a769ff24b7e5384f0c82d62668dd96ed56685f649da114b4dbb '; \ + sops --version + +RUN apk add --no-cache gnupg + +COPY docker-entrypoint.sh /docker-entrypoint.sh +RUN chmod +x docker-entrypoint.sh + +ENTRYPOINT [ "/docker-entrypoint.sh" ] diff --git a/variants/7.4-alpine-3.20-git-sops/docker-entrypoint.sh b/variants/7.4-alpine-3.20-git-sops/docker-entrypoint.sh new file mode 100644 index 0000000..5b23d6d --- /dev/null +++ b/variants/7.4-alpine-3.20-git-sops/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -eu + +if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then + set -- pwsh "$@" +fi + +exec "$@" \ No newline at end of file diff --git a/variants/7.4-alpine-3.20-git/Dockerfile b/variants/7.4-alpine-3.20-git/Dockerfile new file mode 100644 index 0000000..a914a52 --- /dev/null +++ b/variants/7.4-alpine-3.20-git/Dockerfile @@ -0,0 +1,20 @@ +FROM mcr.microsoft.com/powershell:7.4-alpine-3.20 + +# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350 +ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_UPDATECHECK=Off +ENV POWERSHELL_UPDATECHECK_OPTOUT=1 +ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 +ENV DOTNET_TELEMETRY_OPTOUT=1 +ENV COMPlus_EnableDiagnostics=0 + +# Install Pester +RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose' + +RUN apk add --no-cache git + +COPY docker-entrypoint.sh /docker-entrypoint.sh +RUN chmod +x docker-entrypoint.sh + +ENTRYPOINT [ "/docker-entrypoint.sh" ] diff --git a/variants/7.4-alpine-3.20-git/docker-entrypoint.sh b/variants/7.4-alpine-3.20-git/docker-entrypoint.sh new file mode 100644 index 0000000..5b23d6d --- /dev/null +++ b/variants/7.4-alpine-3.20-git/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -eu + +if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then + set -- pwsh "$@" +fi + +exec "$@" \ No newline at end of file diff --git a/variants/7.4-alpine-3.20/Dockerfile b/variants/7.4-alpine-3.20/Dockerfile new file mode 100644 index 0000000..470d9e4 --- /dev/null +++ b/variants/7.4-alpine-3.20/Dockerfile @@ -0,0 +1,18 @@ +FROM mcr.microsoft.com/powershell:7.4-alpine-3.20 + +# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350 +ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_TELEMETRY_OPTOUT=1 +ENV POWERSHELL_UPDATECHECK=Off +ENV POWERSHELL_UPDATECHECK_OPTOUT=1 +ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 +ENV DOTNET_TELEMETRY_OPTOUT=1 +ENV COMPlus_EnableDiagnostics=0 + +# Install Pester +RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose' + +COPY docker-entrypoint.sh /docker-entrypoint.sh +RUN chmod +x docker-entrypoint.sh + +ENTRYPOINT [ "/docker-entrypoint.sh" ] diff --git a/variants/7.4-alpine-3.20/docker-entrypoint.sh b/variants/7.4-alpine-3.20/docker-entrypoint.sh new file mode 100644 index 0000000..5b23d6d --- /dev/null +++ b/variants/7.4-alpine-3.20/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -eu + +if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then + set -- pwsh "$@" +fi + +exec "$@" \ No newline at end of file