Skip to content

Commit

Permalink
ansible: add gcc 12 to Linux containers (#3865)
Browse files Browse the repository at this point in the history 
Add gcc 12 to RHEL/UBI and Ubuntu containers.

Update arm containers from Ubuntu 20.04 to 22.04.

Remove unused CentOS 7 container.

Refs: #3806
Refs: #3846
  • Loading branch information
@richardlau
richardlau authored Aug 16, 2024
1 parent 065a002 commit 24912dc
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 190 deletions.
58 changes: 0 additions & 58 deletions ansible/roles/docker/templates/centos7.Dockerfile.j2
View file

This file was deleted.

11 changes: 6 additions & 5 deletions ansible/roles/docker/templates/rhel8.Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ RUN dnf install --disableplugin=subscription-manager -y \
&& dnf install --disableplugin=subscription-manager -y \
ccache \
gcc-c++ \
gcc-toolset-12 \
git \
java-17-openjdk-headless \
make \
Expand All @@ -28,11 +29,11 @@ RUN dnf install --disableplugin=subscription-manager -y \
&& dnf --disableplugin=subscription-manager clean all

RUN dnf install --disableplugin=subscription-manager -y \
http://mirror.centos.org/centos/8-stream/AppStream/{{ ansible_architecture }}/os/Packages/gcc-toolset-10-binutils-2.35-11.el8.{{ ansible_architecture }}.rpm \
http://mirror.centos.org/centos/8-stream/AppStream/{{ ansible_architecture }}/os/Packages/gcc-toolset-10-gcc-10.3.1-1.2.el8_5.{{ ansible_architecture }}.rpm \
http://mirror.centos.org/centos/8-stream/AppStream/{{ ansible_architecture }}/os/Packages/gcc-toolset-10-gcc-c++-10.3.1-1.2.el8_5.{{ ansible_architecture }}.rpm \
http://mirror.centos.org/centos/8-stream/AppStream/{{ ansible_architecture }}/os/Packages/gcc-toolset-10-libstdc++-devel-10.3.1-1.2.el8_5.{{ ansible_architecture }}.rpm \
http://mirror.centos.org/centos/8-stream/AppStream/{{ ansible_architecture }}/os/Packages/gcc-toolset-10-runtime-10.1-0.el8.{{ ansible_architecture }}.rpm
http://vault.centos.org/centos/8-stream/AppStream/{{ ansible_architecture }}/os/Packages/gcc-toolset-10-binutils-2.35-11.el8.{{ ansible_architecture }}.rpm \
http://vault.centos.org/centos/8-stream/AppStream/{{ ansible_architecture }}/os/Packages/gcc-toolset-10-gcc-10.3.1-1.2.el8_5.{{ ansible_architecture }}.rpm \
http://vault.centos.org/centos/8-stream/AppStream/{{ ansible_architecture }}/os/Packages/gcc-toolset-10-gcc-c++-10.3.1-1.2.el8_5.{{ ansible_architecture }}.rpm \
http://vault.centos.org/centos/8-stream/AppStream/{{ ansible_architecture }}/os/Packages/gcc-toolset-10-libstdc++-devel-10.3.1-1.2.el8_5.{{ ansible_architecture }}.rpm \
http://vault.centos.org/centos/8-stream/AppStream/{{ ansible_architecture }}/os/Packages/gcc-toolset-10-runtime-10.1-0.el8.{{ ansible_architecture }}.rpm

RUN groupadd -r -g {{ server_user_gid.stdout_lines[0] }} {{ server_user }} \
&& adduser -r -m -d /home/{{ server_user }}/ \
Expand Down
1 change: 1 addition & 0 deletions ansible/roles/docker/templates/rhel8_arm_cross.Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ RUN dnf install --disableplugin=subscription-manager -y \
&& dnf install --disableplugin=subscription-manager -y \
ccache \
gcc-c++ \
gcc-toolset-12 \
git \
glibc-devel.i686 \
java-17-openjdk-headless \
Expand Down
11 changes: 6 additions & 5 deletions ansible/roles/docker/templates/ubi81.Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ RUN dnf install --disableplugin=subscription-manager -y \
&& dnf install --disableplugin=subscription-manager -y \
ccache \
gcc-c++ \
gcc-toolset-12 \
git \
java-17-openjdk-headless \
make \
Expand All @@ -28,11 +29,11 @@ RUN dnf install --disableplugin=subscription-manager -y \
&& dnf --disableplugin=subscription-manager clean all

RUN dnf install --disableplugin=subscription-manager -y \
http://mirror.centos.org/centos/8-stream/AppStream/{{ ansible_architecture }}/os/Packages/gcc-toolset-10-binutils-2.35-11.el8.{{ ansible_architecture }}.rpm \
http://mirror.centos.org/centos/8-stream/AppStream/{{ ansible_architecture }}/os/Packages/gcc-toolset-10-gcc-10.3.1-1.2.el8_5.{{ ansible_architecture }}.rpm \
http://mirror.centos.org/centos/8-stream/AppStream/{{ ansible_architecture }}/os/Packages/gcc-toolset-10-gcc-c++-10.3.1-1.2.el8_5.{{ ansible_architecture }}.rpm \
http://mirror.centos.org/centos/8-stream/AppStream/{{ ansible_architecture }}/os/Packages/gcc-toolset-10-libstdc++-devel-10.3.1-1.2.el8_5.{{ ansible_architecture }}.rpm \
http://mirror.centos.org/centos/8-stream/AppStream/{{ ansible_architecture }}/os/Packages/gcc-toolset-10-runtime-10.1-0.el8.{{ ansible_architecture }}.rpm
http://vault.centos.org/centos/8-stream/AppStream/{{ ansible_architecture }}/os/Packages/gcc-toolset-10-binutils-2.35-11.el8.{{ ansible_architecture }}.rpm \
http://vault.centos.org/centos/8-stream/AppStream/{{ ansible_architecture }}/os/Packages/gcc-toolset-10-gcc-10.3.1-1.2.el8_5.{{ ansible_architecture }}.rpm \
http://vault.centos.org/centos/8-stream/AppStream/{{ ansible_architecture }}/os/Packages/gcc-toolset-10-gcc-c++-10.3.1-1.2.el8_5.{{ ansible_architecture }}.rpm \
http://vault.centos.org/centos/8-stream/AppStream/{{ ansible_architecture }}/os/Packages/gcc-toolset-10-libstdc++-devel-10.3.1-1.2.el8_5.{{ ansible_architecture }}.rpm \
http://vault.centos.org/centos/8-stream/AppStream/{{ ansible_architecture }}/os/Packages/gcc-toolset-10-runtime-10.1-0.el8.{{ ansible_architecture }}.rpm

RUN groupadd -r -g {{ server_user_gid.stdout_lines[0] }} {{ server_user }} \
&& adduser -r -m -d /home/{{ server_user }}/ \
Expand Down
6 changes: 1 addition & 5 deletions ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,7 @@ RUN addgroup --gid {{ server_user_gid.stdout_lines[0] }} {{ server_user }}

RUN adduser --gid {{ server_user_gid.stdout_lines[0] }} --uid {{ server_user_uid.stdout_lines[0] }} --disabled-password --gecos {{ server_user }} {{ server_user }}

ENV ICU64DIR=/opt/icu-64 \
ICU65DIR=/opt/icu-65 \
ICU67DIR=/opt/icu-67 \
ICU68DIR=/opt/icu-68 \
ICU69DIR=/opt/icu-69 \
ENV ICU69DIR=/opt/icu-69 \
ICU71DIR=/opt/icu-71 \
ICU73DIR=/opt/icu-73

Expand Down
111 changes: 0 additions & 111 deletions ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2
View file

This file was deleted.

6 changes: 3 additions & 3 deletions ...docker/templates/ubuntu2004.Dockerfile.j2 → ...docker/templates/ubuntu2204.Dockerfile.j2
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

ENV LC_ALL C
ENV USER {{ server_user }}
Expand All @@ -16,10 +16,10 @@ ENV DEBIAN_FRONTEND noninteractive

RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \
ccache \
g++-8 \
gcc-8 \
g++-10 \
gcc-10 \
g++-12 \
gcc-12 \
git \
openjdk-17-jre-headless \
curl \
Expand Down
6 changes: 3 additions & 3 deletions ...templates/ubuntu2004_armv7l.Dockerfile.j2 → ...templates/ubuntu2204_armv7l.Dockerfile.j2
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM arm32v7/ubuntu:20.04
FROM arm32v7/ubuntu:22.04

ENV LC_ALL C
ENV USER {{ server_user }}
Expand All @@ -14,10 +14,10 @@ ENV DESTCPU {{ arch }}
ENV ARCH {{ arch }}
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y ccache \
g++-8 \
gcc-8 \
g++-10 \
gcc-10 \
g++-12 \
gcc-12 \
git \
openjdk-17-jre-headless \
pkg-config \
Expand Down

0 comments on commit 24912dc

Please sign in to comment.