Skip to content

Commit 6bef195

Browse files
theohbrothersbottheohbrothersbot
authored
Merge pull request #90 from theohbrothers/enhancement/add-pwsh-7.5.1-variants
Enhancement: Add pwsh 7.5.1 variants
2 parents a28e444 + ab6d2d6 commit 6bef195

File tree

15 files changed

+664
-2
lines changed

15 files changed

+664
-2
lines changed

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

Lines changed: 458 additions & 1 deletion
Large diffs are not rendered by default.

‎README.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ Dockerized `powershell`, based on [mcr.microsoft.com/powershell](https://hub.doc
1010

1111
| Tag | Dockerfile Build Context |
1212
|:-------:|:---------:|
13+
| `:7.5-alpine-3.20` | [View](variants/7.5-alpine-3.20) |
14+
| `:7.5-alpine-3.20-git` | [View](variants/7.5-alpine-3.20-git) |
15+
| `:7.5-alpine-3.20-git-sops` | [View](variants/7.5-alpine-3.20-git-sops) |
1316
| `:7.4-alpine-3.20` | [View](variants/7.4-alpine-3.20) |
1417
| `:7.4-alpine-3.20-git` | [View](variants/7.4-alpine-3.20-git) |
1518
| `:7.4-alpine-3.20-git-sops` | [View](variants/7.4-alpine-3.20-git-sops) |
@@ -31,7 +34,10 @@ Dockerized `powershell`, based on [mcr.microsoft.com/powershell](https://hub.doc
3134
| `:6.1.3-alpine-3.8` | [View](variants/6.1.3-alpine-3.8) |
3235
| `:6.1.3-alpine-3.8-git` | [View](variants/6.1.3-alpine-3.8-git) |
3336
| `:6.1.3-alpine-3.8-git-sops` | [View](variants/6.1.3-alpine-3.8-git-sops) |
34-
| `:7.4-ubuntu-22.04`, `:latest` | [View](variants/7.4-ubuntu-22.04) |
37+
| `:7.5-ubuntu-24.04`, `:latest` | [View](variants/7.5-ubuntu-24.04) |
38+
| `:7.5-ubuntu-24.04-git` | [View](variants/7.5-ubuntu-24.04-git) |
39+
| `:7.5-ubuntu-24.04-git-sops` | [View](variants/7.5-ubuntu-24.04-git-sops) |
40+
| `:7.4-ubuntu-22.04` | [View](variants/7.4-ubuntu-22.04) |
3541
| `:7.4-ubuntu-22.04-git` | [View](variants/7.4-ubuntu-22.04-git) |
3642
| `:7.4-ubuntu-22.04-git-sops` | [View](variants/7.4-ubuntu-22.04-git-sops) |
3743
| `:7.3-ubuntu-22.04` | [View](variants/7.3-ubuntu-22.04) |

‎generate/definitions/versions.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"pwsh": {
33
"versions": [
4+
"7.5.1",
45
"7.4.9",
56
"7.3.12",
67
"7.2.24"

‎variants/7.5-alpine-3.20-git-sops/Dockerfile‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
FROM mcr.microsoft.com/powershell:7.5-alpine-3.20
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+
15+
RUN apk add --no-cache git
16+
17+
RUN set -eux; \
18+
wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.3/sops-v3.7.3.linux > /usr/local/bin/sops; \
19+
chmod +x /usr/local/bin/sops; \
20+
sha256sum /usr/local/bin/sops | grep '^53aec65e45f62a769ff24b7e5384f0c82d62668dd96ed56685f649da114b4dbb '; \
21+
sops --version
22+
23+
RUN apk add --no-cache gnupg
24+
25+
COPY docker-entrypoint.sh /docker-entrypoint.sh
26+
RUN chmod +x docker-entrypoint.sh
27+
28+
ENTRYPOINT [ "/docker-entrypoint.sh" ]

‎variants/7.5-alpine-3.20-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.5-alpine-3.20-git/Dockerfile‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
FROM mcr.microsoft.com/powershell:7.5-alpine-3.20
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+
15+
RUN apk add --no-cache git
16+
17+
COPY docker-entrypoint.sh /docker-entrypoint.sh
18+
RUN chmod +x docker-entrypoint.sh
19+
20+
ENTRYPOINT [ "/docker-entrypoint.sh" ]

‎variants/7.5-alpine-3.20-git/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.5-alpine-3.20/Dockerfile‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
FROM mcr.microsoft.com/powershell:7.5-alpine-3.20
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+
15+
COPY docker-entrypoint.sh /docker-entrypoint.sh
16+
RUN chmod +x docker-entrypoint.sh
17+
18+
ENTRYPOINT [ "/docker-entrypoint.sh" ]

‎variants/7.5-alpine-3.20/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.5-ubuntu-24.04-git-sops/Dockerfile‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
FROM mcr.microsoft.com/powershell:7.5-ubuntu-24.04
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+
15+
RUN set -eux; \
16+
apt-get update; \
17+
apt-get install -y git; \
18+
rm -rf /var/lib/apt/lists/*
19+
20+
# Install sops
21+
RUN set -eux; \
22+
buildDeps="wget"; \
23+
apt-get update; \
24+
apt-get install --no-install-recommends -y $buildDeps; \
25+
wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.1/sops-v3.7.1.linux > /usr/local/bin/sops; \
26+
chmod +x /usr/local/bin/sops; \
27+
sha256sum /usr/local/bin/sops | grep '^185348fd77fc160d5bdf3cd20ecbc796163504fd3df196d7cb29000773657b74 '; \
28+
sops --version; \
29+
apt-get purge --auto-remove -y $buildDeps; \
30+
apt-get clean; \
31+
rm -rf /var/lib/apt/lists/*
32+
33+
# Install gnupg for sops
34+
RUN set -eux; \
35+
apt-get update; \
36+
apt-get install --no-install-recommends -y gnupg2; \
37+
apt-get clean; \
38+
rm -rf /var/lib/apt/lists/*
39+
40+
COPY docker-entrypoint.sh /docker-entrypoint.sh
41+
RUN chmod +x docker-entrypoint.sh
42+
43+
ENTRYPOINT [ "/docker-entrypoint.sh" ]

0 commit comments

Comments
 (0)