From 47082efc7632b6d60c607c2b7824af14c478edcd Mon Sep 17 00:00:00 2001 From: Vicente Adolfo Bolea Sanchez Date: Thu, 10 Aug 2023 18:24:56 -0400 Subject: [PATCH] CI: use full image tag --- .../Dockerfile.ci-spack-ubuntu20.04-clang | 2 +- .../Dockerfile.ci-spack-ubuntu20.04-gcc | 2 +- .../Dockerfile.ci-spack-ubuntu20.04-intel | 2 +- scripts/ci/images/build-ubuntu.sh | 23 +++++++------------ 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/scripts/ci/images/Dockerfile.ci-spack-ubuntu20.04-clang b/scripts/ci/images/Dockerfile.ci-spack-ubuntu20.04-clang index ff9e0f0dfa..7e3ffa619d 100644 --- a/scripts/ci/images/Dockerfile.ci-spack-ubuntu20.04-clang +++ b/scripts/ci/images/Dockerfile.ci-spack-ubuntu20.04-clang @@ -1,4 +1,4 @@ -FROM adios2:ci-spack-ubuntu20.04-base +FROM ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base ARG CLANG_VERSION=10 RUN apt-get update && apt-get install -y \ diff --git a/scripts/ci/images/Dockerfile.ci-spack-ubuntu20.04-gcc b/scripts/ci/images/Dockerfile.ci-spack-ubuntu20.04-gcc index cfd679d5ca..741ac230d4 100644 --- a/scripts/ci/images/Dockerfile.ci-spack-ubuntu20.04-gcc +++ b/scripts/ci/images/Dockerfile.ci-spack-ubuntu20.04-gcc @@ -1,4 +1,4 @@ -FROM adios2:ci-spack-ubuntu20.04-base +FROM ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base ARG GCC_VERSION=8 RUN apt-get update && apt-get install -y \ diff --git a/scripts/ci/images/Dockerfile.ci-spack-ubuntu20.04-intel b/scripts/ci/images/Dockerfile.ci-spack-ubuntu20.04-intel index c66b0a93a9..2fe9ac6a8e 100644 --- a/scripts/ci/images/Dockerfile.ci-spack-ubuntu20.04-intel +++ b/scripts/ci/images/Dockerfile.ci-spack-ubuntu20.04-intel @@ -1,4 +1,4 @@ -FROM adios2:ci-spack-ubuntu20.04-base +FROM ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base RUN wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | tee /usr/share/keyrings/oneapi-archive-keyring.gpg && \ echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | tee /etc/apt/sources.list.d/oneAPI.list && \ diff --git a/scripts/ci/images/build-ubuntu.sh b/scripts/ci/images/build-ubuntu.sh index 2129e79767..1a535c1203 100755 --- a/scripts/ci/images/build-ubuntu.sh +++ b/scripts/ci/images/build-ubuntu.sh @@ -3,29 +3,22 @@ set -ex # Build the base image -docker build --rm -f ./Dockerfile.ci-spack-ubuntu20.04-base -t adios2:ci-spack-ubuntu20.04-base . +docker build --rm -f ./Dockerfile.ci-spack-ubuntu20.04-base -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base . # Which is also the gcc11 image -docker tag adios2:ci-spack-ubuntu20.04-base adios2:ci-spack-ubuntu20.04-gcc11 +docker tag ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc11 # Build the gcc8, gcc9, and gcc10 images -docker build --rm --build-arg GCC_VERSION=8 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t adios2:ci-spack-ubuntu20.04-gcc8 . -docker build --rm --build-arg GCC_VERSION=9 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t adios2:ci-spack-ubuntu20.04-gcc9 . -docker build --rm --build-arg GCC_VERSION=10 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t adios2:ci-spack-ubuntu20.04-gcc10 . +docker build --rm --build-arg GCC_VERSION=8 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc8 . +docker build --rm --build-arg GCC_VERSION=9 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc9 . +docker build --rm --build-arg GCC_VERSION=10 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc10 . # Build the clang6 and clang10 images -docker build --rm --build-arg CLANG_VERSION=6.0 -f ./Dockerfile.ci-spack-ubuntu20.04-clang -t adios2:ci-spack-ubuntu20.04-clang6 . -docker build --rm --build-arg CLANG_VERSION=10 -f ./Dockerfile.ci-spack-ubuntu20.04-clang -t adios2:ci-spack-ubuntu20.04-clang10 . - -# Tag images for pushing -docker tag adios2:ci-spack-ubuntu20.04-gcc8 ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc8 -docker tag adios2:ci-spack-ubuntu20.04-gcc9 ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc9 -docker tag adios2:ci-spack-ubuntu20.04-gcc10 ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc10 -docker tag adios2:ci-spack-ubuntu20.04-gcc11 ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc11 -docker tag adios2:ci-spack-ubuntu20.04-clang6 ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-clang6 -docker tag adios2:ci-spack-ubuntu20.04-clang10 ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-clang10 +docker build --rm --build-arg CLANG_VERSION=6.0 -f ./Dockerfile.ci-spack-ubuntu20.04-clang -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-clang6 . +docker build --rm --build-arg CLANG_VERSION=10 -f ./Dockerfile.ci-spack-ubuntu20.04-clang -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-clang10 . # Push images to github container registry +docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc8 docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc9 docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc10