Skip to content

Commit 607444c

Browse files
committed
Switch off debian:8 to debian:10 for the typescript build image
We only want to use an old version for glibc which the centos:7 image takes care of. The old version of git used in debian:8 was causing problems with the uid/gid passthrough with no user in passwd.
1 parent b22f3cb commit 607444c

File tree

7 files changed

+19
-31
lines changed

7 files changed

+19
-31
lines changed

.github/workflows/ci.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
steps:
99
- uses: actions/checkout@v1
1010
- name: Run ./ci/steps/fmt.sh
11-
uses: ./ci/images/debian8
11+
uses: ./ci/images/debian10
1212
with:
1313
args: ./ci/steps/fmt.sh
1414

@@ -17,7 +17,7 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@v1
1919
- name: Run ./ci/steps/lint.sh
20-
uses: ./ci/images/debian8
20+
uses: ./ci/images/debian10
2121
with:
2222
args: ./ci/steps/lint.sh
2323

@@ -26,7 +26,7 @@ jobs:
2626
steps:
2727
- uses: actions/checkout@v1
2828
- name: Run ./ci/steps/test.sh
29-
uses: ./ci/images/debian8
29+
uses: ./ci/images/debian10
3030
with:
3131
args: ./ci/steps/test.sh
3232

@@ -35,7 +35,7 @@ jobs:
3535
steps:
3636
- uses: actions/checkout@v1
3737
- name: Run ./ci/steps/release.sh
38-
uses: ./ci/images/debian8
38+
uses: ./ci/images/debian10
3939
with:
4040
args: ./ci/steps/release.sh
4141
- name: Upload npm package artifact
@@ -116,7 +116,7 @@ jobs:
116116
name: release-packages
117117
path: ./release-packages
118118
- name: Run ./ci/steps/build-docker-image.sh
119-
uses: ./ci/images/debian8
119+
uses: ./ci/images/debian10
120120
with:
121121
args: ./ci/steps/build-docker-image.sh
122122
- name: Upload release image

.github/workflows/publish.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
steps:
1111
- uses: actions/checkout@v1
1212
- name: Run ./ci/steps/publish-npm.sh
13-
uses: ./ci/images/debian8
13+
uses: ./ci/images/debian10
1414
with:
1515
args: ./ci/steps/publish-npm.sh
1616
env:
@@ -22,7 +22,7 @@ jobs:
2222
steps:
2323
- uses: actions/checkout@v1
2424
- name: Run ./ci/steps/push-docker-manifest.sh
25-
uses: ./ci/images/debian8
25+
uses: ./ci/images/debian10
2626
with:
2727
args: ./ci/steps/push-docker-manifest.sh
2828
env:

ci/dev/image/run.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ main() {
1111
--rm \
1212
-v "$PWD:/src" \
1313
-e HOME="/src/.home" \
14+
-e USER="coder" \
1415
-w /src \
1516
-p 127.0.0.1:8080:8080 \
1617
-u "$(id -u):$(id -g)" \
1718
-e CI \
18-
"$(docker_build ./ci/images/debian8)" \
19+
"$(docker_build ./ci/images/"${IMAGE-debian10}")" \
1920
"$@"
2021
}
2122

ci/dev/lint.sh

+1-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@ main() {
77
eslint --max-warnings=0 --fix $(git ls-files "*.ts" "*.tsx" "*.js")
88
stylelint $(git ls-files "*.css")
99
tsc --noEmit
10-
# See comment in ./ci/image/debian8
11-
if [[ ! ${CI-} ]]; then
12-
shellcheck -e SC2046,SC2164,SC2154,SC1091,SC1090,SC2002 $(git ls-files "*.sh")
13-
fi
10+
shellcheck -e SC2046,SC2164,SC2154,SC1091,SC1090,SC2002 $(git ls-files "*.sh")
1411
}
1512

1613
main "$@"

ci/images/centos7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN npm config set python python2
1515
RUN yum install -y epel-release && yum install -y jq
1616
RUN yum install -y rsync
1717

18-
# Copied from ../debian8/Dockerfile
18+
# Copied from ../debian10/Dockerfile
1919
# Install Go dependencies
2020
RUN ARCH="$(uname -m | sed 's/x86_64/amd64/; s/aarch64/arm64/')" && \
2121
curl -fsSL "https://dl.google.com/go/go1.14.3.linux-$ARCH.tar.gz" | tar -C /usr/local -xz

ci/images/debian8/Dockerfile renamed to ci/images/debian10/Dockerfile

+6-16
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:8
1+
FROM debian:10
22

33
RUN apt-get update
44

@@ -24,23 +24,13 @@ RUN apt-get install -y build-essential \
2424
RUN apt-get install -y gettext-base
2525

2626
# Misc build dependencies.
27-
RUN apt-get install -y git rsync unzip
28-
29-
# We need latest jq from debian buster for date support.
30-
RUN ARCH="$(dpkg --print-architecture)" && \
31-
curl -fsSOL http://http.us.debian.org/debian/pool/main/libo/libonig/libonig5_6.9.1-1_$ARCH.deb && \
32-
dpkg -i libonig*.deb && \
33-
curl -fsSOL http://http.us.debian.org/debian/pool/main/j/jq/libjq1_1.5+dfsg-2+b1_$ARCH.deb && \
34-
dpkg -i libjq*.deb && \
35-
curl -fsSOL http://http.us.debian.org/debian/pool/main/j/jq/jq_1.5+dfsg-2+b1_$ARCH.deb && \
36-
dpkg -i jq*.deb && rm *.deb
27+
RUN apt-get install -y git rsync unzip jq
3728

3829
# Installs shellcheck.
39-
# Unfortunately coredumps on debian:8 so disabled for now.
40-
#RUN curl -fsSL https://github.com/koalaman/shellcheck/releases/download/v0.7.1/shellcheck-v0.7.1.linux.$(uname -m).tar.xz | \
41-
# tar -xJ && \
42-
# mv shellcheck*/shellcheck /usr/local/bin && \
43-
# rm -R shellcheck*
30+
RUN curl -fsSL https://github.com/koalaman/shellcheck/releases/download/v0.7.1/shellcheck-v0.7.1.linux.$(uname -m).tar.xz | \
31+
tar -xJ && \
32+
mv shellcheck*/shellcheck /usr/local/bin && \
33+
rm -R shellcheck*
4434

4535
# Install Go dependencies
4636
RUN ARCH="$(uname -m | sed 's/x86_64/amd64/; s/aarch64/arm64/')" && \

doc/CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Differences:
3232
- We require a minimum of node v12 but later versions should work.
3333
- We use [nfpm](https://github.com/goreleaser/nfpm) to build `.deb` and `.rpm` packages.
3434
- We use [jq](https://stedolan.github.io/jq/) to build code-server releases.
35-
- The [CI container](../ci/images/debian8/Dockerfile) is a useful reference for all our dependencies.
35+
- The [CI container](../ci/images/debian10/Dockerfile) is a useful reference for all our dependencies.
3636

3737
## Development Workflow
3838

@@ -76,7 +76,7 @@ node .
7676
Build release packages (make sure you run `./ci/steps/release.sh` first):
7777

7878
```
79-
./ci/dev/image/run.sh ./ci/steps/release-packages.sh
79+
IMAGE=centos7 ./ci/dev/image/run.sh ./ci/steps/release-packages.sh
8080
# The standalone release is in ./release-standalone
8181
# .deb, .rpm and the standalone archive are in ./release-packages
8282
```

0 commit comments

Comments
 (0)