From f48a812e5b1f5bb1dd6492d58effbb926b265423 Mon Sep 17 00:00:00 2001 From: Moss Cantwell Date: Tue, 28 Nov 2023 15:53:02 +1300 Subject: [PATCH] feat: add aws cli for rpmbuilds in order to sync from s3 during each package build these containers need aws cli --- images/rpmbuild-centos-stream8/Dockerfile | 5 ++++- images/rpmbuild-centos-stream9/Dockerfile | 7 ++++++- images/rpmbuild-centos7/Dockerfile | 11 ++++++++--- images/rpmbuild-fedora/Dockerfile | 2 +- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/images/rpmbuild-centos-stream8/Dockerfile b/images/rpmbuild-centos-stream8/Dockerfile index 2553b46..27b4cd3 100644 --- a/images/rpmbuild-centos-stream8/Dockerfile +++ b/images/rpmbuild-centos-stream8/Dockerfile @@ -13,4 +13,7 @@ RUN dnf update -y && \ kernel-devel libdbi libdbi-devel libgfortran libxml2 \ libxml2-devel make ncurses ncurses-devel nodejs npm octave \ openssl pango pango-devel perl-devel python3 qt5-qtwebengine \ - rpm-build rpmdevtools rpm-sign rpmlint shadow-utils systemd + rpm-build rpmdevtools rpm-sign rpmlint shadow-utils systemd unzip + +RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && unzip awscliv2.zip +RUN ./aws/install diff --git a/images/rpmbuild-centos-stream9/Dockerfile b/images/rpmbuild-centos-stream9/Dockerfile index c905eeb..f4c1222 100644 --- a/images/rpmbuild-centos-stream9/Dockerfile +++ b/images/rpmbuild-centos-stream9/Dockerfile @@ -1,6 +1,11 @@ FROM ghcr.io/geonet/base-images/centos:stream9 # Installing tools needed for rpmbuild + RUN dnf update -y && \ dnf install -y \ rpm-build rpmdevtools rpm-sign rpmlint git dnf-plugins-core nodejs npm make automake gcc \ - gcc-c++ kernel-devel python3 glibc systemd openssl fontconfig-devel freetype freetype-devel boost + gcc-c++ kernel-devel python3 glibc systemd openssl fontconfig-devel freetype freetype-devel boost unzip + +RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" +RUN unzip awscliv2.zip +RUN ./aws/install diff --git a/images/rpmbuild-centos7/Dockerfile b/images/rpmbuild-centos7/Dockerfile index 76cab57..c330336 100644 --- a/images/rpmbuild-centos7/Dockerfile +++ b/images/rpmbuild-centos7/Dockerfile @@ -1,8 +1,9 @@ FROM ghcr.io/geonet/base-images/centos:centos7 # Install prerequisites RUN curl -O https://nodejs.org/dist/v16.20.2/node-v16.20.2-linux-x64.tar.xz \ - && tar --strip-components 1 -xvf node-v* -C /usr/local \ - && yum install -y epel-release + && tar --strip-components 1 -xvf node-v* -C /usr/local \ + && yum install -y epel-release + # Update system RUN yum update -y && \ yum install -y autoconf automake boost boost-filesystem boost-iostreams \ @@ -11,4 +12,8 @@ RUN yum update -y && \ freetype freetype-devel gcc gcc-c++ git libdbi libdbi-devel libgfortran \ libxml2 libxml2-devel m2crypto make ncurses ncurses-devel numpy octave \ openssl pango pango-devel perl-devel python3 qtwebkit rpm-build \ - rpmdevtools rpmlint rpm-sign shadow-utils systemd tar yum-utils + rpmdevtools rpmlint rpm-sign shadow-utils systemd tar yum-utils unzip + +RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" +RUN unzip awscliv2.zip +RUN ./aws/install diff --git a/images/rpmbuild-fedora/Dockerfile b/images/rpmbuild-fedora/Dockerfile index 2c3e5a0..c58a9ee 100644 --- a/images/rpmbuild-fedora/Dockerfile +++ b/images/rpmbuild-fedora/Dockerfile @@ -3,4 +3,4 @@ FROM ghcr.io/geonet/base-images/fedora:38 RUN dnf update -y && \ dnf install -y \ rpm-build rpmdevtools rpm-sign rpmlint git dnf-plugins-core nodejs npm make automake gcc \ - gcc-c++ kernel-devel python3 glibc systemd openssl fontconfig-devel freetype freetype-devel boost + gcc-c++ kernel-devel python3 glibc systemd openssl fontconfig-devel freetype freetype-devel boost awscli