Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions scripts/ci/images/Dockerfile.ci-spack-ubuntu20.04-base
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# vim: ft=dockerfile
ARG BASE_IMAGE=ecpe4s/ubuntu20.04-runner-amd64-gcc-11.4:2023.08.01
ARG BASE_IMAGE=docker.io/ecpe4s/ubuntu20.04-runner-amd64-gcc-11.4:2023.08.01
FROM $BASE_IMAGE

ARG E4S_VERSION=23.08
Expand Down Expand Up @@ -76,7 +76,9 @@ RUN apt-get update && apt-get install -y \
apt-get remove -y \
gcc-9 \
g++-9 \
gfortran-9 && \
gfortran-9 \
zip \
&& \
apt-get autoremove --purge -y && \
apt-get clean && \
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100 && \
Expand Down
28 changes: 14 additions & 14 deletions scripts/ci/images/build-ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@
set -ex

# Build the base image
docker build --progress=plain \
podman build --progress=plain \
--build-arg EXTRA_VARIANTS="+blosc+ssc ^mgard@2023-01-10" \
--build-arg PATCH_VARIANT_XROOTD=ON \
--rm -f ./Dockerfile.ci-spack-ubuntu20.04-base \
-t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base \
.

# Build the gcc8, gcc9, and gcc10 images
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=10 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc10 .
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 .
podman build --rm --build-arg GCC_VERSION=8 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc8 .
podman build --rm --build-arg GCC_VERSION=10 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc10 .
podman build --rm --build-arg GCC_VERSION=9 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc9 .

# Build the clang6 and clang10 images
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 .
podman 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 .
podman build --rm --build-arg CLANG_VERSION=10 -f ./Dockerfile.ci-spack-ubuntu20.04-clang -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-clang10 .

# Build the ubuntu 22.04 img
docker build \
podman build \
--progress=plain \
--rm \
--build-arg BASE_IMAGE="ecpe4s/ubuntu22.04-runner-amd64-gcc-11.4:2024.04.19" \
Expand All @@ -31,10 +31,10 @@ docker build \
.

# 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
docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-clang6
docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-clang10
docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu22.04-gcc11
podman push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base
podman push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc8
podman push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc9
podman push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc10
podman push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-clang6
podman push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-clang10
podman push ghcr.io/ornladios/adios2:ci-spack-ubuntu22.04-gcc11
Loading