Skip to content

Commit 6c97da7

Browse files
authored
Roll back alpine changes (microsoft#25)
* Revert "bump node on alpine (microsoft#20) (microsoft#22)" This reverts commit 007bc8f. * customize docker image tag for alpine images
1 parent ead6510 commit 6c97da7

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

alpine-arm64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM arm64v8/node:16.19.1-alpine
1+
FROM arm64v8/node:14.16.0-alpine
22

3-
RUN apk add g++ python3 make git bash curl perl pkgconfig libsecret-dev && uname -m
3+
RUN apk add g++ python make git bash curl perl pkgconfig libsecret-dev && uname -m
44

55
RUN mkdir -p /root/vscode
66
WORKDIR /root/vscode

alpine-x64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ARG REPO=node
2-
ARG TAG=16.19.1-alpine
2+
ARG TAG=14.16.0-alpine
33
FROM ${REPO}:${TAG}
44

5-
RUN apk add g++ python3 make git bash curl perl pkgconfig libsecret-dev
5+
RUN apk add g++ python make git bash curl perl pkgconfig libsecret-dev
66

77
RUN mkdir -p /root/vscode
88
WORKDIR /root/vscode

azure-pipelines.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
- template: build.yml
3232
parameters:
3333
arch: alpine-x64
34+
tag: alpine-311-x64
3435

3536
- job: alpine_arm64
3637
pool:
@@ -40,6 +41,7 @@ jobs:
4041
parameters:
4142
qemu: 'true'
4243
arch: alpine-arm64
44+
tag: alpine-311-arm64
4345

4446
- job: buster_arm64
4547
pool:

build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ steps:
1616
inputs:
1717
containerRegistry: VSCodeHub
1818
repository: 'vscode-linux-build-agent'
19-
tags: ${{ parameters.arch }}
19+
tags: ${{ coalesce(parameters.tag, parameters.arch) }}
2020
command: push
2121
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))

0 commit comments

Comments
 (0)