From 21d091a4d33b71dceb06fd09cd1b8556a09b0bfd Mon Sep 17 00:00:00 2001 From: Richard Salomon Date: Tue, 1 Aug 2023 13:05:33 +0200 Subject: [PATCH 1/2] Update docker version to Fedora38 to fix build issues --- Docker/packages.build | 2 ++ Docker/packages.runtime | 1 + Dockerfile | 2 +- Scripts/update-docker.sh | 8 ++++---- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Docker/packages.build b/Docker/packages.build index fdbc4e53a..ce546375b 100644 --- a/Docker/packages.build +++ b/Docker/packages.build @@ -7,7 +7,9 @@ gsl-devel boost-devel zlib-devel libxml2-devel +liburing-devel tbb-devel vtk-devel ocl-icd-devel root-core +root-genvector diff --git a/Docker/packages.runtime b/Docker/packages.runtime index 7292f630b..ecd6a4912 100644 --- a/Docker/packages.runtime +++ b/Docker/packages.runtime @@ -5,3 +5,4 @@ vtk-java boost-filesystem ocl-icd root-core +root-genvector diff --git a/Dockerfile b/Dockerfile index e9714dcc5..161e9a1d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # --- runtime-base --- -FROM fedora:31 as runtime-base +FROM fedora:38 as runtime-base LABEL description="Runtime base container" LABEL maintainer="jan.behrens@kit.edu" diff --git a/Scripts/update-docker.sh b/Scripts/update-docker.sh index 94fde96fc..92a8c3189 100755 --- a/Scripts/update-docker.sh +++ b/Scripts/update-docker.sh @@ -20,10 +20,10 @@ sudo docker run -it katrinexperiment/kassiopeia UnitTestKasper || exit $? ###### -echo "-- pushing to DockerHub ..." -sudo docker tag $IMAGE:latest katrinexperiment/kassiopeia:$VERSION -sudo docker push katrinexperiment/kassiopeia:$VERSION -sudo docker push katrinexperiment/kassiopeia:latest +#echo "-- pushing to DockerHub ..." +#sudo docker tag $IMAGE:latest katrinexperiment/kassiopeia:$VERSION +#sudo docker push katrinexperiment/kassiopeia:$VERSION +#sudo docker push katrinexperiment/kassiopeia:latest echo "-- pushing to GitHub ..." sudo docker tag $IMAGE:latest docker.pkg.github.com/katrin-experiment/kassiopeia/kassiopeia:$VERSION From ec908529cca5cf52a21e00944fe58f748dd16621 Mon Sep 17 00:00:00 2001 From: Richard S <83545331+richeldichel@users.noreply.github.com> Date: Tue, 1 Aug 2023 14:25:55 +0200 Subject: [PATCH 2/2] Remove push to DockerHub in Scripts/update-docker.sh Co-authored-by: 2xB <31772910+2xB@users.noreply.github.com> --- Scripts/update-docker.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Scripts/update-docker.sh b/Scripts/update-docker.sh index 92a8c3189..4b68fc731 100755 --- a/Scripts/update-docker.sh +++ b/Scripts/update-docker.sh @@ -20,11 +20,6 @@ sudo docker run -it katrinexperiment/kassiopeia UnitTestKasper || exit $? ###### -#echo "-- pushing to DockerHub ..." -#sudo docker tag $IMAGE:latest katrinexperiment/kassiopeia:$VERSION -#sudo docker push katrinexperiment/kassiopeia:$VERSION -#sudo docker push katrinexperiment/kassiopeia:latest - echo "-- pushing to GitHub ..." sudo docker tag $IMAGE:latest docker.pkg.github.com/katrin-experiment/kassiopeia/kassiopeia:$VERSION sudo docker push docker.pkg.github.com/katrin-experiment/kassiopeia/kassiopeia:$VERSION