Skip to content

Commit b1aa430

Browse files
bthomeebthomee
committed
Fix RHEL, env vars
1 parent c6f6c52 commit b1aa430

File tree

9 files changed

+49
-34
lines changed

9 files changed

+49
-34
lines changed

‎.github/workflows/debian.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ on:
99
env:
1010
CONTAINER_REGISTRY: ghcr.io
1111
BUILDKIT_PROGRESS: plain
12-
CONAN_VERSION: 2.17.0
12+
BUILDKIT_DOCKERFILE_CHECK: skip=InvalidDefaultArgInFrom
13+
BUILDKIT_INLINE_CACHE: 1
14+
CONAN_VERSION: 2.18.0
15+
GCOVR_VERSION: 8.3
1316
NONROOT_USER: ci
1417
FALLBACK_GCC: 12
1518
FALLBACK_CLANG: 16
@@ -95,12 +98,10 @@ jobs:
9598
uses: docker/build-push-action@v6
9699
with:
97100
build-args: |
98-
BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom
99-
BUILDKIT_INLINE_CACHE=1
100101
CLANG_VERSION=${{ matrix.os.compiler_name == 'clang' && matrix.os.compiler_version || env.FALLBACK_CLANG }}
101-
GCC_VERSION=${{ matrix.os.compiler_name == 'gcc' && matrix.os.compiler_version || env.FALLBACK_GCC }}
102102
CONAN_VERSION=${{ env.CONAN_VERSION }}
103-
GITHUB_REPO=${{ github.repository }}
103+
GCC_VERSION=${{ matrix.os.compiler_name == 'gcc' && matrix.os.compiler_version || env.FALLBACK_GCC }}
104+
GCOVR_VERSION=${{ env.GCOVR_VERSION }}
104105
NONROOT_USER=${{ env.NONROOT_USER }}
105106
DEBIAN_VERSION=${{ matrix.os.release }}
106107
context: docker/debian

‎.github/workflows/rhel.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ env:
1010
CONTAINER_REGISTRY: ghcr.io
1111
REDHAT_REGISTRY: registry.redhat.io
1212
BUILDKIT_PROGRESS: plain
13-
CONAN_VERSION: 2.17.0
13+
BUILDKIT_DOCKERFILE_CHECK: skip=InvalidDefaultArgInFrom
14+
BUILDKIT_INLINE_CACHE: 1
15+
CONAN_VERSION: 2.18.0
16+
GCOVR_VERSION: 8.3
1417
NONROOT_USER: ci
1518

1619
jobs:
@@ -86,11 +89,9 @@ jobs:
8689
uses: docker/build-push-action@v6
8790
with:
8891
build-args: |
89-
BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom
90-
BUILDKIT_INLINE_CACHE=1
9192
CONAN_VERSION=${{ env.CONAN_VERSION }}
9293
GCC_VERSION=${{ matrix.os.compiler_version }}
93-
GITHUB_REPO=${{ github.repository }}
94+
GCOVR_VERSION=${{ env.GCOVR_VERSION }}
9495
NONROOT_USER=${{ env.NONROOT_USER }}
9596
RHEL_VERSION=${{ matrix.os.release }}
9697
context: docker/rhel

‎.github/workflows/ubuntu.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ on:
99
env:
1010
CONTAINER_REGISTRY: ghcr.io
1111
BUILDKIT_PROGRESS: plain
12-
CONAN_VERSION: 2.17.0
12+
BUILDKIT_DOCKERFILE_CHECK: skip=InvalidDefaultArgInFrom
13+
BUILDKIT_INLINE_CACHE: 1
14+
CONAN_VERSION: 2.18.0
15+
GCOVR_VERSION: 8.3
1316
NONROOT_USER: ci
1417
FALLBACK_GCC: 12
1518
FALLBACK_CLANG: 16
@@ -93,12 +96,10 @@ jobs:
9396
uses: docker/build-push-action@v6
9497
with:
9598
build-args: |
96-
BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom
97-
BUILDKIT_INLINE_CACHE=1
9899
CLANG_VERSION=${{ matrix.os.compiler_name == 'clang' && matrix.os.compiler_version || env.FALLBACK_CLANG }}
99-
GCC_VERSION=${{ matrix.os.compiler_name == 'gcc' && matrix.os.compiler_version || env.FALLBACK_GCC }}
100100
CONAN_VERSION=${{ env.CONAN_VERSION }}
101-
GITHUB_REPO=${{ github.repository }}
101+
GCC_VERSION=${{ matrix.os.compiler_name == 'gcc' && matrix.os.compiler_version || env.FALLBACK_GCC }}
102+
GCOVR_VERSION=${{ env.GCOVR_VERSION }}
102103
NONROOT_USER=${{ env.NONROOT_USER }}
103104
UBUNTU_VERSION=${{ matrix.os.release }}
104105
context: docker/ubuntu

‎docker/debian/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ apt update
5252
apt install -y --no-install-recommends "${pkgs[@]}"
5353
EOF
5454

55-
# Install Conan && gcovr.
56-
ARG CONAN_VERSION=2.18.0
57-
ARG GCOVR_VERSION=8.2
55+
# Install Python-based tools.
56+
ARG CONAN_VERSION
57+
ARG GCOVR_VERSION
5858
ENV PIPX_HOME=/opt/pipx \
5959
PIPX_BIN_DIR=/usr/bin \
6060
PIPX_MAN_DIR=/usr/share/man

‎docker/debian/README.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ registry.
4040
NONROOT_USER=${USER}
4141
DEBIAN_VERSION=bookworm
4242
GCC_VERSION=12
43-
CONAN_VERSION=2.17.0
43+
CONAN_VERSION=2.18.0
44+
GCOVR_VERSION=8.3
4445
CONTAINER_IMAGE=xrplf/ci/debian-${DEBIAN_VERSION}:gcc-${GCC_VERSION}
4546

4647
docker buildx build . \
@@ -50,6 +51,7 @@ docker buildx build . \
5051
--build-arg CONAN_VERSION=${CONAN_VERSION} \
5152
--build-arg DEBIAN_VERSION=${DEBIAN_VERSION} \
5253
--build-arg GCC_VERSION=${GCC_VERSION} \
54+
--build-arg GCOVR_VERSION=${GCOVR_VERSION} \
5355
--build-arg NONROOT_USER=${NONROOT_USER} \
5456
--tag ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}
5557
```
@@ -63,7 +65,8 @@ registry.
6365
NONROOT_USER=${USER}
6466
DEBIAN_VERSION=bookworm
6567
CLANG_VERSION=17
66-
CONAN_VERSION=2.17.0
68+
CONAN_VERSION=2.18.0
69+
GCOVR_VERSION=8.3
6770
CONTAINER_IMAGE=xrplf/ci/debian-${DEBIAN_VERSION}:clang-${CLANG_VERSION}
6871

6972
docker buildx build . \
@@ -73,6 +76,7 @@ docker buildx build . \
7376
--build-arg CLANG_VERSION=${CLANG_VERSION} \
7477
--build-arg CONAN_VERSION=${CONAN_VERSION} \
7578
--build-arg DEBIAN_VERSION=${DEBIAN_VERSION} \
79+
--build-arg GCOVR_VERSION=${GCOVR_VERSION} \
7680
--build-arg NONROOT_USER=${NONROOT_USER} \
7781
--tag ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}
7882
```

‎docker/rhel/Dockerfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,16 @@ RUN <<EOF
2222
pkgs=()
2323
pkgs+=(ca-certificates) # Enable TLS verification for HTTPS connections by providing trusted root certificates.
2424
pkgs+=(cmake) # Required build tool.
25+
pkgs+=(file) # Required packaging tool.
2526
pkgs+=(git) # Required build tool.
2627
pkgs+=(gpg) # Dependency for tools requiring signing or encrypting/decrypting.
2728
pkgs+=(jq) # Pretty printing.
2829
pkgs+=(libstdc++-static) # Required to statically link libraries into rippled.
2930
pkgs+=(ninja-build) # Required build tool.
3031
pkgs+=(perl-FindBin) # Required to compile OpenSSL.
3132
pkgs+=(python3-pip) # Package manager for Python applications.
33+
pkgs+=(rpm-build) # Required packaging tool.
34+
pkgs+=(rpmdevtools) # Required packaging tool.
3235
pkgs+=(wget) # Required build tool.
3336
dnf install -y --setopt=tsflags=nodocs "${pkgs[@]}"
3437
EOF
@@ -37,14 +40,11 @@ EOF
3740
COPY --from=rocky /usr/bin/bison /usr/bin/bison
3841
COPY --from=rocky /usr/bin/flex /usr/bin/flex
3942

40-
# Install Conan && gcovr.
41-
ARG CONAN_VERSION=2.18.0
42-
ARG GCOVR_VERSION=8.2
43-
ENV PIPX_HOME=/opt/pipx \
44-
PIPX_BIN_DIR=/usr/bin \
45-
PIPX_MAN_DIR=/usr/share/man
46-
RUN pipx install conan==${CONAN_VERSION} && \
47-
pipx install gcovr==${GCOVR_VERSION}
43+
# Install Python-based tools.
44+
ARG CONAN_VERSION
45+
ARG GCOVR_VERSION
46+
RUN pip install conan==${CONAN_VERSION} && \
47+
pip install gcovr==${GCOVR_VERSION}
4848

4949
# Create the user to switch to, once all packages have been installed.
5050
ARG NONROOT_USER

‎docker/rhel/README.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ registry.
5959
NONROOT_USER=${USER}
6060
RHEL_VERSION=9.6
6161
GCC_VERSION=13
62-
CONAN_VERSION=2.17.0
62+
CONAN_VERSION=2.18.0
63+
GCOVR_VERSION=8.3
6364
CONTAINER_IMAGE=xrplf/ci/rhel-${RHEL_VERSION}:gcc-${GCC_VERSION}
6465

6566
docker buildx build . \
@@ -68,6 +69,7 @@ docker buildx build . \
6869
--build-arg BUILDKIT_INLINE_CACHE=1 \
6970
--build-arg CONAN_VERSION=${CONAN_VERSION} \
7071
--build-arg GCC_VERSION=${GCC_VERSION} \
72+
--build-arg GCOVR_VERSION=${GCOVR_VERSION} \
7173
--build-arg NONROOT_USER=${NONROOT_USER} \
7274
--build-arg RHEL_VERSION=${RHEL_VERSION} \
7375
--tag ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}
@@ -81,14 +83,16 @@ registry.
8183
```shell
8284
NONROOT_USER=${USER}
8385
RHEL_VERSION=9.6
84-
CONAN_VERSION=2.17.0
86+
CONAN_VERSION=2.18.0
87+
GCOVR_VERSION=8.3
8588
CONTAINER_IMAGE=xrplf/ci/rhel-${RHEL_VERSION}:clang-${CLANG_VERSION}
8689

8790
docker buildx build . \
8891
--target clang \
8992
--build-arg BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom \
9093
--build-arg BUILDKIT_INLINE_CACHE=1 \
9194
--build-arg CONAN_VERSION=${CONAN_VERSION} \
95+
--build-arg GCOVR_VERSION=${GCOVR_VERSION} \
9296
--build-arg NONROOT_USER=${NONROOT_USER} \
9397
--build-arg RHEL_VERSION=${RHEL_VERSION} \
9498
--tag ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}

‎docker/ubuntu/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ apt update
4141
apt install -y --no-install-recommends "${pkgs[@]}"
4242
EOF
4343

44-
# Install Conan && gcovr.
45-
ARG CONAN_VERSION=2.18.0
46-
ARG GCOVR_VERSION=8.2
44+
# Install Python-based tools.
45+
ARG CONAN_VERSION
46+
ARG GCOVR_VERSION
4747
ENV PIPX_HOME=/opt/pipx \
4848
PIPX_BIN_DIR=/usr/bin \
4949
PIPX_MAN_DIR=/usr/share/man

‎docker/ubuntu/README.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ registry.
4040
NONROOT_USER=${USER}
4141
UBUNTU_VERSION=noble
4242
GCC_VERSION=14
43-
CONAN_VERSION=2.17.0
43+
CONAN_VERSION=2.18.0
44+
GCOVR_VERSION=8.3
4445
CONTAINER_IMAGE=xrplf/ci/ubuntu-${UBUNTU_VERSION}:gcc-${GCC_VERSION}
4546

4647
docker buildx build . \
@@ -49,6 +50,7 @@ docker buildx build . \
4950
--build-arg BUILDKIT_INLINE_CACHE=1 \
5051
--build-arg CONAN_VERSION=${CONAN_VERSION} \
5152
--build-arg GCC_VERSION=${GCC_VERSION} \
53+
--build-arg GCOVR_VERSION=${GCOVR_VERSION} \
5254
--build-arg NONROOT_USER=${NONROOT_USER} \
5355
--build-arg UBUNTU_VERSION=${UBUNTU_VERSION} \
5456
--tag ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}
@@ -63,7 +65,8 @@ registry.
6365
NONROOT_USER=${USER}
6466
UBUNTU_VERSION=noble
6567
CLANG_VERSION=18
66-
CONAN_VERSION=2.17.0
68+
CONAN_VERSION=2.18.0
69+
GCOVR_VERSION=8.3
6770
CONTAINER_IMAGE=xrplf/ci/ubuntu-${UBUNTU_VERSION}:clang-${CLANG_VERSION}
6871

6972
docker buildx build . \
@@ -72,6 +75,7 @@ docker buildx build . \
7275
--build-arg BUILDKIT_INLINE_CACHE=1 \
7376
--build-arg CLANG_VERSION=${CLANG_VERSION} \
7477
--build-arg CONAN_VERSION=${CONAN_VERSION} \
78+
--build-arg GCOVR_VERSION=${GCOVR_VERSION} \
7579
--build-arg NONROOT_USER=${NONROOT_USER} \
7680
--build-arg UBUNTU_VERSION=${UBUNTU_VERSION} \
7781
--tag ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}

0 commit comments

Comments
 (0)