From 26a4653fb08ab798fbf4f7d65e477269226c40da Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Fri, 15 Jul 2022 10:27:59 -0700 Subject: [PATCH] docker: Add fully built image. --- docker/build-and-push-images.sh | 2 ++ docker/ubuntu/22.04/built/Dockerfile | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 docker/ubuntu/22.04/built/Dockerfile diff --git a/docker/build-and-push-images.sh b/docker/build-and-push-images.sh index af200dd4c..8321792c1 100755 --- a/docker/build-and-push-images.sh +++ b/docker/build-and-push-images.sh @@ -34,6 +34,7 @@ docker build $ARGS -t $ACCT/$REPO:ubuntu-22.04-base-gcc-12 $BASEDIR/ubuntu/22.04 #docker build $ARGS -t $ACCT/$REPO:ubuntu-22.04-base-clang-13 $BASEDIR/ubuntu/22.04/base-clang-13 #docker build $ARGS -t $ACCT/$REPO:ubuntu-22.04-base-clang-14 $BASEDIR/ubuntu/22.04/base-clang-14 docker build $ARGS -t $ACCT/$REPO:ubuntu-22.04-full-clang-14 $BASEDIR/ubuntu/22.04/full-clang-14 +docker build $ARGS -t $ACCT/$REPO:ubuntu-22.04-built $BASEDIR/ubuntu/22.04/built docker push $ACCT/$REPO:ubuntu-22.04-base docker push $ACCT/$REPO:ubuntu-22.04-full @@ -48,3 +49,4 @@ docker push $ACCT/$REPO:ubuntu-22.04-base-gcc-12 #docker push $ACCT/$REPO:ubuntu-22.04-base-clang-13 #docker push $ACCT/$REPO:ubuntu-22.04-base-clang-14 docker push $ACCT/$REPO:ubuntu-22.04-full-clang-14 +docker push $ACCT/$REPO:ubuntu-22.04-built diff --git a/docker/ubuntu/22.04/built/Dockerfile b/docker/ubuntu/22.04/built/Dockerfile new file mode 100644 index 000000000..d9e68b515 --- /dev/null +++ b/docker/ubuntu/22.04/built/Dockerfile @@ -0,0 +1,18 @@ +FROM jevolk/construct:ubuntu-22.04-full-clang-14 + +RUN true \ + && git clone https://github.com/jevolk/charybdis.git \ + && cd charybdis \ + && rmdir -v deps/rocksdb \ + && ln -sv /usr/src/rocksdb deps \ + && ./autogen.sh \ + && ./configure \ + && make -j `nproc` \ + && make install \ + && cd .. \ + && rm -rf charybdis \ + && apt-get purge -y clang-14 llvm-14-dev \ + && apt-get autoremove --purge -y \ + && apt-get clean -y \ + && rm -rf /var/lib/apt/lists/* \ + && true