Skip to content

Commit f32b167

Browse files
committed
Fix Docker build (needs C++14 for ROOT)
1 parent 807b8f5 commit f32b167

File tree

2 files changed

+32
-1
lines changed

2 files changed

+32
-1
lines changed

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,12 @@ RUN cd /usr/src/kasper && \
2929
mkdir -p build && \
3030
pushd build && \
3131
cmake -DCMAKE_BUILD_TYPE=Release \
32+
-DCMAKE_CXX_STANDARD=14 \
3233
-DCMAKE_INSTALL_PREFIX=/usr/local \
3334
-DBUILD_UNIT_TESTS=ON \
3435
-DKASPER_USE_ROOT=ON \
3536
-DKASPER_USE_VTK=ON \
36-
-DKASPER_USE_TBB=ON \
37+
-DKASPER_USE_TBB=OFF \
3738
-DKEMField_USE_OPENCL=OFF \
3839
.. && \
3940
make -j $((($(nproc)+1)/2)) && \

Scripts/update-docker.sh

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#!/bin/sh
2+
3+
VERSION="${1:-testing}"
4+
IMAGE="katrinexperiment/kassiopeia"
5+
6+
RELEASE="$(git describe --tags --exact-match || git symbolic-ref -q --short HEAD)"
7+
8+
if [ "${VERSION}" != "${RELEASE}" -a "v${VERSION}" != "${RELEASE}" ]; then
9+
echo "ERROR: Provided image version $VERSION does not match git branch/tag: $RELEASE"
10+
exit 1
11+
fi
12+
13+
shift 1
14+
15+
echo "-- building $IMAGE:$VERSION ..."
16+
sudo docker build -t $IMAGE $@ . || exit $?
17+
sudo docker run -it katrinexperiment/kassiopeia UnitTestKasper || exit $?
18+
19+
######
20+
#exit 0
21+
######
22+
23+
echo "-- pushing to DockerHub ..."
24+
sudo docker tag $IMAGE:latest katrinexperiment/kassiopeia:$VERSION
25+
sudo docker push katrinexperiment/kassiopeia:$VERSION
26+
sudo docker push katrinexperiment/kassiopeia:latest
27+
28+
echo "-- pushing to GitHub ..."
29+
sudo docker tag $IMAGE:latest docker.pkg.github.com/katrin-experiment/kassiopeia/kassiopeia:$VERSION
30+
sudo docker push docker.pkg.github.com/katrin-experiment/kassiopeia/kassiopeia:$VERSION

0 commit comments

Comments
 (0)