Skip to content

Commit 49a66e8

Browse files
Remove alpine 3.8 and cleanup 3.11 (#451)
Co-authored-by: Aditya Patwardhan <Aditya Patwardhan>
1 parent 743ca51 commit 49a66e8

File tree

18 files changed

+6
-478
lines changed

18 files changed

+6
-478
lines changed

release/lts/alpine38/dependabot/Dockerfile

Lines changed: 0 additions & 1 deletion
This file was deleted.

release/lts/alpine38/docker/Dockerfile

Lines changed: 0 additions & 88 deletions
This file was deleted.

release/lts/alpine38/getLatestTag.ps1

Lines changed: 0 additions & 14 deletions
This file was deleted.

release/lts/alpine38/meta.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

release/lts/alpine38/test-deps/docker/Dockerfile

Lines changed: 0 additions & 38 deletions
This file was deleted.

release/lts/alpine38/test-deps/meta.json

Lines changed: 0 additions & 16 deletions
This file was deleted.

release/preview/alpine311/docker/Dockerfile

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33

44
# Docker image file that describes an Alpine3.11 image with PowerShell installed from .tar.gz file(s)
55

6-
# Define arg(s) needed for the From statement
7-
ARG fromTag=3.11
8-
ARG imageRepo=alpine
9-
10-
FROM ${imageRepo}:${fromTag} AS installer-env
6+
FROM alpine:3.11 AS installer-env
117

128
# Define Args for the needed to add the package
139
ARG PS_VERSION=7.0.0-preview.1
@@ -28,9 +24,7 @@ RUN mkdir -p ${PS_INSTALL_FOLDER}
2824
RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
2925

3026
# Start a new stage so we lose all the tar.gz layers from the final image
31-
FROM ${imageRepo}:${fromTag}
32-
33-
ARG fromTag=3.11
27+
FROM alpine:3.11
3428

3529
# Copy only the files we need from the previous stage
3630
COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
@@ -45,7 +39,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
4539
LANG=en_US.UTF-8 \
4640
# set a fixed location for the Module analysis cache
4741
PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
48-
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-${fromTag}
42+
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.11
4943

5044
# Install dotnet dependencies and ca-certificates
5145
RUN apk add --no-cache \

release/preview/alpine311/getLatestTag.ps1

Lines changed: 0 additions & 14 deletions
This file was deleted.

release/preview/alpine311/meta.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
"#psversion#-alpine-#tag#",
88
"preview-alpine-#shorttag#"
99
],
10+
"shortTags": [
11+
{"Tag": "3.11"}
12+
],
1013
"SkipGssNtlmSspTests": true,
1114
"SubImage": "test-deps",
1215
"TestProperties": {

release/preview/alpine38/dependabot/Dockerfile

Lines changed: 0 additions & 1 deletion
This file was deleted.

release/preview/alpine38/docker/Dockerfile

Lines changed: 0 additions & 88 deletions
This file was deleted.

release/preview/alpine38/getLatestTag.ps1

Lines changed: 0 additions & 14 deletions
This file was deleted.

release/preview/alpine38/meta.json

Lines changed: 0 additions & 15 deletions
This file was deleted.

release/preview/alpine38/test-deps/docker/Dockerfile

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)