Skip to content

Commit daef497

Browse files
committed
ci: use official base docker image for builds
Referenced issue: * status-im/infra-ci#188
1 parent 9380290 commit daef497

File tree

6 files changed

+11
-46
lines changed

6 files changed

+11
-46
lines changed

_assets/ci/Jenkinsfile.android

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ library 'status-jenkins-lib@v1.9.26'
33

44
pipeline {
55
agent {
6-
dockerfile {
6+
docker {
77
label 'linuxcontainer'
8-
filename 'linux.Dockerfile'
8+
image 'harbor.status.im/infra/ci-build-containers:linux-base-1.0.0'
99
dir '_assets/ci/'
1010
args '--volume=/nix:/nix ' +
1111
'--volume=/etc/nix:/etc/nix '

_assets/ci/Jenkinsfile.linux

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ library 'status-jenkins-lib@v1.9.26'
44

55
pipeline {
66
agent {
7-
dockerfile {
7+
docker {
88
label 'linuxcontainer'
9-
filename 'linux.Dockerfile'
10-
dir '_assets/ci/'
9+
image 'harbor.status.im/infra/ci-build-containers:linux-base-1.0.0'
1110
args '--volume=/nix:/nix ' +
1211
'--volume=/etc/nix:/etc/nix '
1312
}

_assets/ci/Jenkinsfile.linux-nix

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ library 'status-jenkins-lib@v1.9.26'
44

55
pipeline {
66
agent {
7-
dockerfile {
7+
docker {
88
label 'linuxcontainer'
9-
filename 'linux.Dockerfile'
10-
dir '_assets/ci/'
9+
image 'harbor.status.im/infra/ci-build-containers:linux-base-1.0.0'
1110
args '--volume=/nix:/nix ' +
1211
'--volume=/etc/nix:/etc/nix '
1312
}

_assets/ci/Jenkinsfile.nwaku

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ library 'status-jenkins-lib@v1.9.26'
44

55
pipeline {
66
agent {
7-
dockerfile {
7+
docker {
88
label 'linuxcontainer'
9-
filename 'linux.Dockerfile'
10-
dir '_assets/ci/'
9+
image 'harbor.status.im/infra/ci-build-containers:linux-base-1.0.0'
1110
args '--volume=/nix:/nix ' +
1211
'--volume=/etc/nix:/etc/nix '
1312
}

_assets/ci/linux.Dockerfile

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

_assets/ci/tests.Dockerfile

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
FROM debian:bookworm-slim
1+
FROM harbor.status.im/infra/ci-build-containers:linux-base-1.0.0
2+
3+
USER root
24

35
RUN apt-get update && apt-get install -yq --no-install-recommends --fix-missing \
4-
curl \
5-
ca-certificates \
66
lsb-release \
77
xz-utils \
88
gnupg \
99
wget \
10-
git \
1110
build-essential \
1211
python3 \
1312
python3-pip \
@@ -31,16 +30,6 @@ RUN mkdir -p /etc/apt/keyrings && \
3130
docker-compose-plugin \
3231
&& rm -rf /var/lib/apt/lists/*
3332

34-
RUN groupadd -r jenkins --gid 1001 \
35-
&& useradd -r -m -g jenkins --uid 1001 -d /home/jenkins jenkins
36-
37-
RUN groupadd -g 999 docker && \
38-
usermod -a -G docker jenkins
39-
4033
USER jenkins
4134

42-
ENV PATH="${PATH}:/nix/var/nix/profiles/default/bin"
43-
ENV NIX_REMOTE=daemon
44-
ENV HOME=/home/jenkins
45-
4635
ENTRYPOINT [""]

0 commit comments

Comments
 (0)