Skip to content

Commit c23ed52

Browse files
leojonathanohleojonathanoh
committed
Enhancement: Bump v7.2 variantsto v7.2.14
1 parent d090745 commit c23ed52

File tree

7 files changed

+82
-18
lines changed

7 files changed

+82
-18
lines changed

‎.github/workflows/ci-master-pr.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -272,10 +272,10 @@ jobs:
272272
rm -rf /tmp/.buildx-cache
273273
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
274274
275-
build-7-2-2-alpine-3-14:
275+
build-7-2-alpine-3-17:
276276
runs-on: ubuntu-latest
277277
env:
278-
VARIANT: 7.2.2-alpine-3.14
278+
VARIANT: 7.2-alpine-3.17
279279
steps:
280280
- name: Checkout
281281
uses: actions/checkout@v3
@@ -347,7 +347,7 @@ jobs:
347347
if: github.event_name == 'pull_request'
348348
uses: docker/build-push-action@v3
349349
with:
350-
context: variants/7.2.2-alpine-3.14
350+
context: variants/7.2-alpine-3.17
351351
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
352352
push: false
353353
tags: |
@@ -361,7 +361,7 @@ jobs:
361361
if: github.ref == 'refs/heads/master'
362362
uses: docker/build-push-action@v3
363363
with:
364-
context: variants/7.2.2-alpine-3.14
364+
context: variants/7.2-alpine-3.17
365365
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
366366
push: true
367367
tags: |
@@ -374,7 +374,7 @@ jobs:
374374
if: startsWith(github.ref, 'refs/tags/')
375375
uses: docker/build-push-action@v3
376376
with:
377-
context: variants/7.2.2-alpine-3.14
377+
context: variants/7.2-alpine-3.17
378378
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
379379
push: true
380380
tags: |
@@ -392,10 +392,10 @@ jobs:
392392
rm -rf /tmp/.buildx-cache
393393
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
394394
395-
build-7-2-2-alpine-3-14-git-sops:
395+
build-7-2-alpine-3-17-git-sops:
396396
runs-on: ubuntu-latest
397397
env:
398-
VARIANT: 7.2.2-alpine-3.14-git-sops
398+
VARIANT: 7.2-alpine-3.17-git-sops
399399
steps:
400400
- name: Checkout
401401
uses: actions/checkout@v3
@@ -467,7 +467,7 @@ jobs:
467467
if: github.event_name == 'pull_request'
468468
uses: docker/build-push-action@v3
469469
with:
470-
context: variants/7.2.2-alpine-3.14-git-sops
470+
context: variants/7.2-alpine-3.17-git-sops
471471
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
472472
push: false
473473
tags: |
@@ -481,7 +481,7 @@ jobs:
481481
if: github.ref == 'refs/heads/master'
482482
uses: docker/build-push-action@v3
483483
with:
484-
context: variants/7.2.2-alpine-3.14-git-sops
484+
context: variants/7.2-alpine-3.17-git-sops
485485
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
486486
push: true
487487
tags: |
@@ -494,7 +494,7 @@ jobs:
494494
if: startsWith(github.ref, 'refs/tags/')
495495
uses: docker/build-push-action@v3
496496
with:
497-
context: variants/7.2.2-alpine-3.14-git-sops
497+
context: variants/7.2-alpine-3.17-git-sops
498498
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
499499
push: true
500500
tags: |
@@ -3154,7 +3154,7 @@ jobs:
31543154
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
31553155
31563156
update-draft-release:
3157-
needs: [build-7-3-alpine-3-17, build-7-3-alpine-3-17-git-sops, build-7-2-2-alpine-3-14, build-7-2-2-alpine-3-14-git-sops, build-7-1-5-alpine-3-13, build-7-1-5-alpine-3-13-git-sops, build-7-0-3-alpine-3-9, build-7-0-3-alpine-3-9-git-sops, build-6-2-4-alpine-3-8, build-6-2-4-alpine-3-8-git-sops, build-6-1-3-alpine-3-8, build-6-1-3-alpine-3-8-git-sops, build-7-3-ubuntu-22-04, build-7-3-ubuntu-22-04-git-sops, build-7-2-2-ubuntu-20-04, build-7-2-2-ubuntu-20-04-git-sops, build-7-1-5-ubuntu-20-04, build-7-1-5-ubuntu-20-04-git-sops, build-7-0-3-ubuntu-18-04, build-7-0-3-ubuntu-18-04-git-sops, build-6-2-4-ubuntu-18-04, build-6-2-4-ubuntu-18-04-git-sops, build-6-1-3-ubuntu-18-04, build-6-1-3-ubuntu-18-04-git-sops, build-6-0-4-ubuntu-16-04, build-6-0-4-ubuntu-16-04-git-sops]
3157+
needs: [build-7-3-alpine-3-17, build-7-3-alpine-3-17-git-sops, build-7-2-alpine-3-17, build-7-2-alpine-3-17-git-sops, build-7-1-5-alpine-3-13, build-7-1-5-alpine-3-13-git-sops, build-7-0-3-alpine-3-9, build-7-0-3-alpine-3-9-git-sops, build-6-2-4-alpine-3-8, build-6-2-4-alpine-3-8-git-sops, build-6-1-3-alpine-3-8, build-6-1-3-alpine-3-8-git-sops, build-7-3-ubuntu-22-04, build-7-3-ubuntu-22-04-git-sops, build-7-2-2-ubuntu-20-04, build-7-2-2-ubuntu-20-04-git-sops, build-7-1-5-ubuntu-20-04, build-7-1-5-ubuntu-20-04-git-sops, build-7-0-3-ubuntu-18-04, build-7-0-3-ubuntu-18-04-git-sops, build-6-2-4-ubuntu-18-04, build-6-2-4-ubuntu-18-04-git-sops, build-6-1-3-ubuntu-18-04, build-6-1-3-ubuntu-18-04-git-sops, build-6-0-4-ubuntu-16-04, build-6-0-4-ubuntu-16-04-git-sops]
31583158
if: github.ref == 'refs/heads/master'
31593159
runs-on: ubuntu-latest
31603160
steps:
@@ -3167,7 +3167,7 @@ jobs:
31673167
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
31683168

31693169
publish-draft-release:
3170-
needs: [build-7-3-alpine-3-17, build-7-3-alpine-3-17-git-sops, build-7-2-2-alpine-3-14, build-7-2-2-alpine-3-14-git-sops, build-7-1-5-alpine-3-13, build-7-1-5-alpine-3-13-git-sops, build-7-0-3-alpine-3-9, build-7-0-3-alpine-3-9-git-sops, build-6-2-4-alpine-3-8, build-6-2-4-alpine-3-8-git-sops, build-6-1-3-alpine-3-8, build-6-1-3-alpine-3-8-git-sops, build-7-3-ubuntu-22-04, build-7-3-ubuntu-22-04-git-sops, build-7-2-2-ubuntu-20-04, build-7-2-2-ubuntu-20-04-git-sops, build-7-1-5-ubuntu-20-04, build-7-1-5-ubuntu-20-04-git-sops, build-7-0-3-ubuntu-18-04, build-7-0-3-ubuntu-18-04-git-sops, build-6-2-4-ubuntu-18-04, build-6-2-4-ubuntu-18-04-git-sops, build-6-1-3-ubuntu-18-04, build-6-1-3-ubuntu-18-04-git-sops, build-6-0-4-ubuntu-16-04, build-6-0-4-ubuntu-16-04-git-sops]
3170+
needs: [build-7-3-alpine-3-17, build-7-3-alpine-3-17-git-sops, build-7-2-alpine-3-17, build-7-2-alpine-3-17-git-sops, build-7-1-5-alpine-3-13, build-7-1-5-alpine-3-13-git-sops, build-7-0-3-alpine-3-9, build-7-0-3-alpine-3-9-git-sops, build-6-2-4-alpine-3-8, build-6-2-4-alpine-3-8-git-sops, build-6-1-3-alpine-3-8, build-6-1-3-alpine-3-8-git-sops, build-7-3-ubuntu-22-04, build-7-3-ubuntu-22-04-git-sops, build-7-2-2-ubuntu-20-04, build-7-2-2-ubuntu-20-04-git-sops, build-7-1-5-ubuntu-20-04, build-7-1-5-ubuntu-20-04-git-sops, build-7-0-3-ubuntu-18-04, build-7-0-3-ubuntu-18-04-git-sops, build-6-2-4-ubuntu-18-04, build-6-2-4-ubuntu-18-04-git-sops, build-6-1-3-ubuntu-18-04, build-6-1-3-ubuntu-18-04-git-sops, build-6-0-4-ubuntu-16-04, build-6-0-4-ubuntu-16-04-git-sops]
31713171
if: startsWith(github.ref, 'refs/tags/')
31723172
runs-on: ubuntu-latest
31733173
steps:
@@ -3182,7 +3182,7 @@ jobs:
31823182
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
31833183

31843184
update-dockerhub-description:
3185-
needs: [build-7-3-alpine-3-17, build-7-3-alpine-3-17-git-sops, build-7-2-2-alpine-3-14, build-7-2-2-alpine-3-14-git-sops, build-7-1-5-alpine-3-13, build-7-1-5-alpine-3-13-git-sops, build-7-0-3-alpine-3-9, build-7-0-3-alpine-3-9-git-sops, build-6-2-4-alpine-3-8, build-6-2-4-alpine-3-8-git-sops, build-6-1-3-alpine-3-8, build-6-1-3-alpine-3-8-git-sops, build-7-3-ubuntu-22-04, build-7-3-ubuntu-22-04-git-sops, build-7-2-2-ubuntu-20-04, build-7-2-2-ubuntu-20-04-git-sops, build-7-1-5-ubuntu-20-04, build-7-1-5-ubuntu-20-04-git-sops, build-7-0-3-ubuntu-18-04, build-7-0-3-ubuntu-18-04-git-sops, build-6-2-4-ubuntu-18-04, build-6-2-4-ubuntu-18-04-git-sops, build-6-1-3-ubuntu-18-04, build-6-1-3-ubuntu-18-04-git-sops, build-6-0-4-ubuntu-16-04, build-6-0-4-ubuntu-16-04-git-sops]
3185+
needs: [build-7-3-alpine-3-17, build-7-3-alpine-3-17-git-sops, build-7-2-alpine-3-17, build-7-2-alpine-3-17-git-sops, build-7-1-5-alpine-3-13, build-7-1-5-alpine-3-13-git-sops, build-7-0-3-alpine-3-9, build-7-0-3-alpine-3-9-git-sops, build-6-2-4-alpine-3-8, build-6-2-4-alpine-3-8-git-sops, build-6-1-3-alpine-3-8, build-6-1-3-alpine-3-8-git-sops, build-7-3-ubuntu-22-04, build-7-3-ubuntu-22-04-git-sops, build-7-2-2-ubuntu-20-04, build-7-2-2-ubuntu-20-04-git-sops, build-7-1-5-ubuntu-20-04, build-7-1-5-ubuntu-20-04-git-sops, build-7-0-3-ubuntu-18-04, build-7-0-3-ubuntu-18-04-git-sops, build-6-2-4-ubuntu-18-04, build-6-2-4-ubuntu-18-04-git-sops, build-6-1-3-ubuntu-18-04, build-6-1-3-ubuntu-18-04-git-sops, build-6-0-4-ubuntu-16-04, build-6-0-4-ubuntu-16-04-git-sops]
31863186
if: github.ref == 'refs/heads/master'
31873187
runs-on: ubuntu-latest
31883188
steps:

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ Dockerized `powershell`, based on [mcr.microsoft.com/powershell](https://hub.doc
1212
|:-------:|:---------:|
1313
| `:7.3-alpine-3.17` | [View](variants/7.3-alpine-3.17) |
1414
| `:7.3-alpine-3.17-git-sops` | [View](variants/7.3-alpine-3.17-git-sops) |
15-
| `:7.2.2-alpine-3.14` | [View](variants/7.2.2-alpine-3.14) |
16-
| `:7.2.2-alpine-3.14-git-sops` | [View](variants/7.2.2-alpine-3.14-git-sops) |
15+
| `:7.2-alpine-3.17` | [View](variants/7.2-alpine-3.17) |
16+
| `:7.2-alpine-3.17-git-sops` | [View](variants/7.2-alpine-3.17-git-sops) |
1717
| `:7.1.5-alpine-3.13` | [View](variants/7.1.5-alpine-3.13) |
1818
| `:7.1.5-alpine-3.13-git-sops` | [View](variants/7.1.5-alpine-3.13-git-sops) |
1919
| `:7.0.3-alpine-3.9` | [View](variants/7.0.3-alpine-3.9) |

‎generate/definitions/VARIANTS.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Docker image variants' definitions
22
$local:BASE_IMAGE_TAGS = @(
33
'7.3-alpine-3.17'
4-
'7.2.2-alpine-3.14-20220318'
4+
'lts-7.2-alpine-3.17'
55
'7.1.5-alpine-3.13-20211021'
66
'7.0.3-alpine-3.9-20200928'
77
'6.2.4-alpine-3.8'
@@ -37,9 +37,9 @@ $VARIANTS = @(
3737
platforms = 'linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x'
3838
components = $subVariant['components']
3939
}
40-
# Docker image tag. E.g. '6.1.0-alpine-3.8', '6.1.0-alpine-3.8-git',
40+
# Docker image tag. E.g. '7.1.5-alpine-3.13'
4141
tag = @(
42-
$variant['base_image_tag'] -replace '-\d{8}', ''
42+
$variant['base_image_tag'] -replace '^lts-', '' -replace '-\d{8}$', '' # Replace 'lts-' prefix and 8-digit calver suffix
4343
$subVariant['components'] | ? { $_ }
4444
) -join '-'
4545
tag_as_latest = if ($variant['base_image_tag'] -eq $local:BASE_IMAGE_TAG_LATEST_STABLE -and $subVariant['components'].Count -eq 0) { $true } else { $false }

‎variants/7.2-alpine-3.17-git-sops/Dockerfile‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
FROM mcr.microsoft.com/powershell:lts-7.2-alpine-3.17
2+
3+
# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350
4+
ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1
5+
ENV POWERSHELL_TELEMETRY_OPTOUT=1
6+
ENV POWERSHELL_UPDATECHECK=Off
7+
ENV POWERSHELL_UPDATECHECK_OPTOUT=1
8+
ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
9+
ENV DOTNET_TELEMETRY_OPTOUT=1
10+
ENV COMPlus_EnableDiagnostics=0
11+
12+
# Install Pester
13+
RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
14+
RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
15+
16+
RUN apk add --no-cache git
17+
18+
RUN set -eux; \
19+
wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.1/sops-v3.7.1.linux > /usr/local/bin/sops; \
20+
chmod +x /usr/local/bin/sops; \
21+
sha256sum /usr/local/bin/sops | grep '^185348fd77fc160d5bdf3cd20ecbc796163504fd3df196d7cb29000773657b74 '; \
22+
sops --version
23+
24+
RUN apk add --no-cache gnupg
25+
26+
COPY docker-entrypoint.sh /docker-entrypoint.sh
27+
RUN chmod +x docker-entrypoint.sh
28+
29+
ENTRYPOINT [ "/docker-entrypoint.sh" ]

‎variants/7.2-alpine-3.17-git-sops/docker-entrypoint.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/sh
2+
set -eu
3+
4+
if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
5+
set -- pwsh "$@"
6+
fi
7+
8+
exec "$@"

‎variants/7.2-alpine-3.17/Dockerfile‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
FROM mcr.microsoft.com/powershell:lts-7.2-alpine-3.17
2+
3+
# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350
4+
ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1
5+
ENV POWERSHELL_TELEMETRY_OPTOUT=1
6+
ENV POWERSHELL_UPDATECHECK=Off
7+
ENV POWERSHELL_UPDATECHECK_OPTOUT=1
8+
ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
9+
ENV DOTNET_TELEMETRY_OPTOUT=1
10+
ENV COMPlus_EnableDiagnostics=0
11+
12+
# Install Pester
13+
RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
14+
RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
15+
16+
COPY docker-entrypoint.sh /docker-entrypoint.sh
17+
RUN chmod +x docker-entrypoint.sh
18+
19+
ENTRYPOINT [ "/docker-entrypoint.sh" ]

‎variants/7.2-alpine-3.17/docker-entrypoint.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/sh
2+
set -eu
3+
4+
if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
5+
set -- pwsh "$@"
6+
fi
7+
8+
exec "$@"

0 commit comments

Comments
 (0)