Skip to content

Commit 259574e

Browse files
Pietfriedandistorm
Pietfried
and
andistorm
authored
feat(build-env-base): Add iproute2 package. This will allow EVerest E2E tests to dynamically create veth pairs (#150)
* feat(build-env-base): Add iproute2 package. This will allow EVerest E2E tests to dynamically create veth pairs Signed-off-by: Piet Gömpel <pietgoempel@gmail.com> * Update versions of additional packages Signed-off-by: Piet Gömpel <pietgoempel@gmail.com> * use GITHUB_TOKEN Signed-off-by: Andreas Heinrich <andreas.heinrich@rwth-aachen.de> * use GITHUB_TOKEN also for ghcr Signed-off-by: Andreas Heinrich <andreas.heinrich@rwth-aachen.de> * use GITHUb_TOKEN for all images Signed-off-by: Andreas Heinrich <andreas.heinrich@rwth-aachen.de> * Update additional packages Signed-off-by: Piet Gömpel <pietgoempel@gmail.com> * Fix libssl version Signed-off-by: Piet Gömpel <pietgoempel@gmail.com> --------- Signed-off-by: Piet Gömpel <pietgoempel@gmail.com> Signed-off-by: Andreas Heinrich <andreas.heinrich@rwth-aachen.de> Co-authored-by: Andreas Heinrich <andreas.heinrich@rwth-aachen.de>
1 parent b8a492f commit 259574e

3 files changed

Lines changed: 53 additions & 29 deletions

File tree

‎.github/workflows/deploy-docker-images.yml‎

Lines changed: 42 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,13 @@ jobs:
5353
- env-setup
5454
name: Build and push run-env-base docker image
5555
uses: ./.github/workflows/deploy-single-docker-image.yml
56+
permissions:
57+
contents: read
58+
packages: write
5659
secrets:
57-
GITHUB_REPOSITORY_PAT: ${{ secrets.SA_GITHUB_PAT }}
58-
DOCKER_REGISTRY_USERNAME: ${{ secrets.SA_GITHUB_USERNAME }}
59-
DOCKER_REGISTRY_PAT: ${{ secrets.SA_GITHUB_PAT }}
60+
GITHUB_REPOSITORY_PAT: ${{ secrets.GITHUB_TOKEN }}
61+
DOCKER_REGISTRY_USERNAME: ${{ github.actor }}
62+
DOCKER_REGISTRY_PAT: ${{ secrets.GITHUB_TOKEN }}
6063
with:
6164
force_rebuild: ${{ needs.env-setup.outputs.force_rebuild == 'true' }}
6265
image_name: ${{ needs.env-setup.outputs.repository_name }}/run-env-base
@@ -74,10 +77,13 @@ jobs:
7477
- run-env-base
7578
name: Build and push build-env-base docker image
7679
uses: ./.github/workflows/deploy-single-docker-image.yml
80+
permissions:
81+
contents: read
82+
packages: write
7783
secrets:
78-
GITHUB_REPOSITORY_PAT: ${{ secrets.SA_GITHUB_PAT }}
79-
DOCKER_REGISTRY_USERNAME: ${{ secrets.SA_GITHUB_USERNAME }}
80-
DOCKER_REGISTRY_PAT: ${{ secrets.SA_GITHUB_PAT }}
84+
GITHUB_REPOSITORY_PAT: ${{ secrets.GITHUB_TOKEN }}
85+
DOCKER_REGISTRY_USERNAME: ${{ github.actor }}
86+
DOCKER_REGISTRY_PAT: ${{ secrets.GITHUB_TOKEN }}
8187
with:
8288
force_rebuild: ${{ needs.env-setup.outputs.force_rebuild == 'true' || needs.run-env-base.outputs.rebuild == 'true' }}
8389
image_name: ${{ needs.env-setup.outputs.repository_name }}/build-env-base
@@ -98,10 +104,13 @@ jobs:
98104
- build-env-base
99105
name: Build and push dev-env-base docker image
100106
uses: ./.github/workflows/deploy-single-docker-image.yml
107+
permissions:
108+
contents: read
109+
packages: write
101110
secrets:
102-
GITHUB_REPOSITORY_PAT: ${{ secrets.SA_GITHUB_PAT }}
103-
DOCKER_REGISTRY_USERNAME: ${{ secrets.SA_GITHUB_USERNAME }}
104-
DOCKER_REGISTRY_PAT: ${{ secrets.SA_GITHUB_PAT }}
111+
GITHUB_REPOSITORY_PAT: ${{ secrets.GITHUB_TOKEN }}
112+
DOCKER_REGISTRY_USERNAME: ${{ github.actor }}
113+
DOCKER_REGISTRY_PAT: ${{ secrets.GITHUB_TOKEN }}
105114
with:
106115
force_rebuild: ${{ needs.env-setup.outputs.force_rebuild == 'true' || needs.build-env-base.outputs.rebuild == 'true' }}
107116
image_name: ${{ needs.env-setup.outputs.repository_name }}/dev-env-base
@@ -121,10 +130,13 @@ jobs:
121130
- build-env-base
122131
name: Build and push build-kit docker image
123132
uses: ./.github/workflows/deploy-single-docker-image.yml
133+
permissions:
134+
contents: read
135+
packages: write
124136
secrets:
125-
GITHUB_REPOSITORY_PAT: ${{ secrets.SA_GITHUB_PAT }}
126-
DOCKER_REGISTRY_USERNAME: ${{ secrets.SA_GITHUB_USERNAME }}
127-
DOCKER_REGISTRY_PAT: ${{ secrets.SA_GITHUB_PAT }}
137+
GITHUB_REPOSITORY_PAT: ${{ secrets.GITHUB_TOKEN }}
138+
DOCKER_REGISTRY_USERNAME: ${{ github.actor }}
139+
DOCKER_REGISTRY_PAT: ${{ secrets.GITHUB_TOKEN }}
128140
with:
129141
force_rebuild: ${{ needs.env-setup.outputs.force_rebuild == 'true' || needs.build-env-base.outputs.rebuild == 'true' }}
130142
image_name: ${{ needs.env-setup.outputs.repository_name }}/build-kit-base
@@ -145,10 +157,13 @@ jobs:
145157
- env-setup
146158
name: Build and push deprecated everest-clang-format docker image
147159
uses: ./.github/workflows/deploy-single-docker-image.yml
160+
permissions:
161+
contents: read
162+
packages: write
148163
secrets:
149-
GITHUB_REPOSITORY_PAT: ${{ secrets.SA_GITHUB_PAT }}
150-
DOCKER_REGISTRY_USERNAME: ${{ secrets.SA_GITHUB_USERNAME }}
151-
DOCKER_REGISTRY_PAT: ${{ secrets.SA_GITHUB_PAT }}
164+
GITHUB_REPOSITORY_PAT: ${{ secrets.GITHUB_TOKEN }}
165+
DOCKER_REGISTRY_USERNAME: ${{ github.actor }}
166+
DOCKER_REGISTRY_PAT: ${{ secrets.GITHUB_TOKEN }}
152167
with:
153168
force_rebuild: ${{ needs.env-setup.outputs.force_rebuild == 'true' }}
154169
image_name: everest-clang-format
@@ -166,10 +181,13 @@ jobs:
166181
- env-setup
167182
name: Build and push deprecated build-kit-alpine docker image
168183
uses: ./.github/workflows/deploy-single-docker-image.yml
184+
permissions:
185+
contents: read
186+
packages: write
169187
secrets:
170-
GITHUB_REPOSITORY_PAT: ${{ secrets.SA_GITHUB_PAT }}
171-
DOCKER_REGISTRY_USERNAME: ${{ secrets.SA_GITHUB_USERNAME }}
172-
DOCKER_REGISTRY_PAT: ${{ secrets.SA_GITHUB_PAT }}
188+
GITHUB_REPOSITORY_PAT: ${{ secrets.GITHUB_TOKEN }}
189+
DOCKER_REGISTRY_USERNAME: ${{ github.actor }}
190+
DOCKER_REGISTRY_PAT: ${{ secrets.GITHUB_TOKEN }}
173191
with:
174192
force_rebuild: ${{ needs.env-setup.outputs.force_rebuild == 'true' }}
175193
image_name: build-kit-alpine
@@ -188,10 +206,13 @@ jobs:
188206
- env-setup
189207
name: Build and push deprecated build-kit-debian docker image
190208
uses: ./.github/workflows/deploy-single-docker-image.yml
209+
permissions:
210+
contents: read
211+
packages: write
191212
secrets:
192-
GITHUB_REPOSITORY_PAT: ${{ secrets.SA_GITHUB_PAT }}
193-
DOCKER_REGISTRY_USERNAME: ${{ secrets.SA_GITHUB_USERNAME }}
194-
DOCKER_REGISTRY_PAT: ${{ secrets.SA_GITHUB_PAT }}
213+
GITHUB_REPOSITORY_PAT: ${{ secrets.GITHUB_TOKEN }}
214+
DOCKER_REGISTRY_USERNAME: ${{ github.actor }}
215+
DOCKER_REGISTRY_PAT: ${{ secrets.GITHUB_TOKEN }}
195216
with:
196217
force_rebuild: ${{ needs.env-setup.outputs.force_rebuild == 'true' }}
197218
image_name: build-kit-debian

‎docker/images/build-env-base/Dockerfile‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ ARG BASE_IMAGE_TAG=latest
33
FROM ghcr.io/everest/everest-ci/run-env-base:${BASE_IMAGE_TAG}
44

55
# renovate: datasource=repology depName=debian_12/git versioning=loose
6-
ENV GIT_VERSION=1:2.39.5-0+deb12u2
6+
ENV GIT_VERSION=1:2.39.5-0+deb12u3
77
# renovate: datasource=repology depName=debian_12/curl versioning=loose
88
ENV CURL_VERSION=7.88.1-10+deb12u14
99
# renovate: datasource=repology depName=debian_12/rsync versioning=loose
10-
ENV RSYNC_VERSION=3.2.7-1+deb12u2
10+
ENV RSYNC_VERSION=3.2.7-1+deb12u4
11+
# renovate: datasource=repology depName=debian_12/iproute2 versioning=loose
12+
ENV IPROUTE2_VERSION=6.1.0-3
1113
# renovate: datasource=repology depName=debian_12/ninja-build versioning=loose
1214
ENV NINJA_BUILD_VERSION=1.11.1-2~deb12u1
1315
# renovate: datasource=repology depName=debian_12/make-dfsg versioning=loose
@@ -37,6 +39,7 @@ RUN apt update \
3739
git=${GIT_VERSION} \
3840
curl=${CURL_VERSION} \
3941
rsync=${RSYNC_VERSION} \
42+
iproute2=${IPROUTE2_VERSION} \
4043
# build tools
4144
ninja-build=${NINJA_BUILD_VERSION} \
4245
make=${MAKE_VERSION} \
@@ -64,15 +67,15 @@ ENV LIBBOOST_ALL_DEV_VERSION=1.74.0.3
6467
# renovate: datasource=repology depName=debian_12/libsqlite3-dev versioning=loose
6568
ENV LIBSQLITE3_DEV_VERSION=3.40.1-2+deb12u2
6669
# renovate: datasource=repology depName=debian_12/openssl versioning=loose
67-
ENV LIBSSL_DEV_VERSION=3.0.17-1~deb12u3
70+
ENV LIBSSL_DEV_VERSION=3.0.18-1~deb12u2
6871
# renovate: datasource=repology depName=debian_12/nodejs versioning=loose
6972
ENV LIBNODE_DEV_VERSION=18.20.4+dfsg-1~deb12u1
7073
# renovate: datasource=repology depName=debian_12/pkg-config versioning=loose
7174
ENV PKG_CONFIG_VERSION=1.8.1-1
7275
# renovate: datasource=repology depName=debian_12/libpcap-dev versioning=loose
7376
ENV LIBPCAP_DEV_VERSION=1.10.3-1
7477
# renovate: datasource=repology depName=debian_12/libcap versioning=loose
75-
ENV LIBCAP_DEV_VERSION=1:2.66-4+deb12u2
78+
ENV LIBCAP_DEV_VERSION=1:2.66-4+deb12u2+b2
7679
# renovate: datasource=repology depName=debian_12/python3-venv versioning=loose
7780
ENV PYTHON3_VENV_VERSION=3.11.2-1+b1
7881
# renovate: datasource=repology depName=debian_12/python3-build versioning=loose

‎docker/images/run-env-base/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
FROM debian:12-slim
33

44
# renovate: datasource=repology depName=debian_12/openjdk-17 versioning=loose
5-
ENV OPENJDK_17_JRE_VERSION=17.0.17+10-1~deb12u1
5+
ENV OPENJDK_17_JRE_VERSION=17.0.18+8-1~deb12u1
66
# renovate: datasource=repology depName=debian_12/nodejs versioning=loose
77
ENV NODEJS_VERSION=18.20.4+dfsg-1~deb12u1
88
# renovate: datasource=repology depName=debian_12/npm versioning=loose
@@ -20,17 +20,17 @@ ENV LIBBOOST_CHRONO1_74_0_VERSION=1.74.0+ds1-21
2020
# renovate: datasource=repology depName=debian_12/boost1.74 versioning=loose
2121
ENV LIBBOOST_SYSTEM1_74_0_VERSION=1.74.0+ds1-21
2222
# renovate: datasource=repology depName=debian_12/openssl versioning=loose
23-
ENV LIBSSL3_VERSION=3.0.17-1~deb12u3
23+
ENV LIBSSL3_VERSION=3.0.18-1~deb12u2
2424
# renovate: datasource=repology depName=debian_12/curl versioning=loose
2525
ENV LIBCURL4_VERSION=7.88.1-10+deb12u14
2626
# renovate: datasource=repology depName=debian_12/libcap2 versioning=loose
27-
ENV LIBCAP2_VERSION=1:2.66-4+deb12u2
27+
ENV LIBCAP2_VERSION=1:2.66-4+deb12u2+b2
2828
# renovate: datasource=repology depName=debian_12/less versioning=loose
2929
ENV LESS_VERSION=590-2.1~deb12u2
3030
# renovate: datasource=repology depName=debian_12/python3-pydantic versioning=loose
3131
ENV PYTHON3_PYDANTIC_VERSION=1.10.4-1
3232
# renovate: datasource=repology depName=debian_12/python-cryptography versioning=loose
33-
ENV PYTHON3_CRYPTOGRAPHY_VERSION=38.0.4-3~deb12u1
33+
ENV PYTHON3_CRYPTOGRAPHY_VERSION=38.0.4-3+deb12u1
3434
# renovate: datasource=repology depName=debian_12/python3-netifaces versioning=loose
3535
ENV PYTHON3_NETIFACES_VERSION=0.11.0-2+b1
3636
# renovate: datasource=repology depName=debian_12/python3-psutil versioning=loose

0 commit comments

Comments
 (0)