From fcd5bb7f7569f92451a319359028d59807bb2011 Mon Sep 17 00:00:00 2001 From: Yagiz Nizipli Date: Tue, 7 Nov 2023 14:07:00 +0000 Subject: [PATCH 1/3] docker: add gcc-10 to ubi81 --- ansible/roles/docker/templates/ubi81.Dockerfile.j2 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ansible/roles/docker/templates/ubi81.Dockerfile.j2 b/ansible/roles/docker/templates/ubi81.Dockerfile.j2 index 6579e17d5..cb2e4dda4 100644 --- a/ansible/roles/docker/templates/ubi81.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubi81.Dockerfile.j2 @@ -27,6 +27,13 @@ RUN dnf install --disableplugin=subscription-manager -y \ procps-ng \ && 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-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.i686.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 + RUN groupadd -r -g {{ server_user_gid.stdout_lines[0] }} {{ server_user }} \ && adduser -r -m -d /home/{{ server_user }}/ \ -g {{ server_user_gid.stdout_lines[0] }} \ From 40be7606a5a71993938861300e661b5e81a2672b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Sun, 12 Nov 2023 14:15:45 +0100 Subject: [PATCH 2/3] Update ansible/roles/docker/templates/ubi81.Dockerfile.j2 Co-authored-by: Richard Lau --- ansible/roles/docker/templates/ubi81.Dockerfile.j2 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ansible/roles/docker/templates/ubi81.Dockerfile.j2 b/ansible/roles/docker/templates/ubi81.Dockerfile.j2 index cb2e4dda4..774305375 100644 --- a/ansible/roles/docker/templates/ubi81.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubi81.Dockerfile.j2 @@ -28,11 +28,10 @@ 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-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.i686.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://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 RUN groupadd -r -g {{ server_user_gid.stdout_lines[0] }} {{ server_user }} \ && adduser -r -m -d /home/{{ server_user }}/ \ From 33295d5bfb52d7b3f49555c07a003d1bf596e09d Mon Sep 17 00:00:00 2001 From: Yagiz Nizipli Date: Sun, 12 Nov 2023 08:19:15 -0500 Subject: [PATCH 3/3] Update ubi81.Dockerfile.j2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Michaël Zasso --- ansible/roles/docker/templates/ubi81.Dockerfile.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/docker/templates/ubi81.Dockerfile.j2 b/ansible/roles/docker/templates/ubi81.Dockerfile.j2 index 774305375..8a9bbb02f 100644 --- a/ansible/roles/docker/templates/ubi81.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubi81.Dockerfile.j2 @@ -31,7 +31,7 @@ RUN dnf install --disableplugin=subscription-manager -y \ 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://mirror.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 }}/ \