Skip to content

Commit 2bdd76a

Browse files
committed
Remove gcc and g++ as they have been added in a separate PR
1 parent 465224d commit 2bdd76a

File tree

4 files changed

+0
-34
lines changed

4 files changed

+0
-34
lines changed

docker/debian/Dockerfile

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -155,21 +155,6 @@ FROM base AS clang
155155
# This is not inherited from base image, ensure no manual interaction needed.
156156
ARG DEBIAN_FRONTEND=noninteractive
157157

158-
# Some build dependencies require GCC to be available.
159-
COPY --from=gcc-src /usr/local/ /usr/local/
160-
COPY --from=gcc-src /etc/ld.so.conf.d/*.conf /etc/ld.so.conf.d/
161-
RUN <<EOF
162-
ldconfig -v
163-
dpkg-divert --divert /usr/bin/gcc.orig --rename /usr/bin/gcc
164-
update-alternatives --install /usr/bin/gcc gcc /usr/local/bin/gcc 100
165-
update-alternatives --install \
166-
/usr/bin/gcc gcc /usr/local/bin/gcc 100 \
167-
--slave /usr/bin/g++ g++ /usr/local/bin/g++ \
168-
--slave /usr/bin/gcc-ar gcc-ar /usr/local/bin/gcc-ar \
169-
--slave /usr/bin/gcc-nm gcc-nm /usr/local/bin/gcc-nm \
170-
--slave /usr/bin/gcc-ranlib gcc-ranlib /usr/local/bin/gcc-ranlib
171-
EOF
172-
173158
# Install Clang. Use the LLVM apt repository to access the latest versions. We
174159
# must repeat the DEBIAN_VERSION argument here, as it is not inherited from the
175160
# base or source images.

docker/debian/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ registry.
7070
DEBIAN_VERSION=bookworm
7171
CLANG_VERSION=17
7272
CONAN_VERSION=2.18.0
73-
GCC_VERSION=12
7473
GCOVR_VERSION=8.3
7574
CONTAINER_IMAGE=xrplf/ci/debian-${DEBIAN_VERSION}:clang-${CLANG_VERSION}
7675

@@ -82,7 +81,6 @@ docker buildx build . \
8281
--build-arg CLANG_VERSION=${CLANG_VERSION} \
8382
--build-arg CONAN_VERSION=${CONAN_VERSION} \
8483
--build-arg DEBIAN_VERSION=${DEBIAN_VERSION} \
85-
--build-arg GCC_VERSION=${GCC_VERSION} \
8684
--build-arg GCOVR_VERSION=${GCOVR_VERSION} \
8785
--tag ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}
8886
```

docker/ubuntu/Dockerfile

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -139,21 +139,6 @@ FROM base AS clang
139139
# This is not inherited from base image, ensure no manual interaction needed.
140140
ARG DEBIAN_FRONTEND=noninteractive
141141

142-
# Some build dependencies require GCC to be available.
143-
ARG GCC_VERSION
144-
RUN <<EOF
145-
apt-get update
146-
apt-get install -y --no-install-recommends \
147-
gcc-${GCC_VERSION} \
148-
g++-${GCC_VERSION} \
149-
debhelper
150-
apt-get clean
151-
rm -rf /var/lib/apt/lists/*
152-
update-alternatives \
153-
--install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_VERSION} 100 \
154-
--slave /usr/bin/g++ g++ /usr/bin/g++-${GCC_VERSION}
155-
EOF
156-
157142
# Install Clang.
158143
ARG CLANG_VERSION
159144
RUN <<EOF

docker/ubuntu/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ registry.
6666
UBUNTU_VERSION=noble
6767
CLANG_VERSION=18
6868
CONAN_VERSION=2.18.0
69-
GCC_VERSION=14
7069
GCOVR_VERSION=8.3
7170
CONTAINER_IMAGE=xrplf/ci/ubuntu-${UBUNTU_VERSION}:clang-${CLANG_VERSION}
7271

@@ -77,7 +76,6 @@ docker buildx build . \
7776
--build-arg BUILDKIT_INLINE_CACHE=1 \
7877
--build-arg CLANG_VERSION=${CLANG_VERSION} \
7978
--build-arg CONAN_VERSION=${CONAN_VERSION} \
80-
--build-arg GCC_VERSION=${GCC_VERSION} \
8179
--build-arg GCOVR_VERSION=${GCOVR_VERSION} \
8280
--build-arg UBUNTU_VERSION=${UBUNTU_VERSION} \
8381
--tag ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}

0 commit comments

Comments
 (0)