commit 1b67d0a7262e9f3c6029c978fb13c2956f697bbf
parent 0044786c317ec9c9f842b87ae202f77f8162ea74
Author: Florian Dold <florian@dold.me>
Date: Thu, 23 Feb 2023 20:35:38 +0100
compile-and-check: clean up, document
Diffstat:
5 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/docker/compile-and-check/README b/docker/compile-and-check/README
@@ -2,20 +2,25 @@ This Docker image compiles and checks all the Taler code
along its entrypoint. In case of build failures, it optionally
offers a debug shell to inspect the running container.
-Build
------
+Build Toolchain Image
+---------------------
-To compile the Git master code, run the following
-command from this directory. Note: some versions
-may require to first export the env var DOCKER_BUILDKIT=1.
-
-$ docker build -t sandcastle-checker base/
+To build image with app dependencies to build Taler, run ./build.sh
Run
---
-After having built the image above, run the following command
-to build Taler and get a debug shell if that fails:
+To start the build process, run
+
+$ ./build.sh
+
+Interactive Debugging
+---------------------
+
+To interactively debug the build process, run
+
+$ ./interactive.sh
+Then inside the container, run the entry point manually
-$ docker run -e SANDCASTLE_DEBUG_SHELL=yes -it sandcastle-checker
+[cointainer]$ /home/talercheck/compile_and_check.sh
diff --git a/docker/compile-and-check/base/Dockerfile b/docker/compile-and-check/base/Dockerfile
@@ -29,7 +29,7 @@ RUN mkdir -p tmp
# and setting PATH correctly
ENV PATH="/home/talercheck/.local/bin:$PATH"
-RUN pip3 install requests click poetry uwsgi htmlark
+RUN pip3 install --break-system-packages requests click poetry uwsgi htmlark
RUN npm config set prefix $HOME/.npm-global
RUN npm install -g pnpm
diff --git a/docker/compile-and-check/buildbot-compile-and-check/build.sh b/docker/compile-and-check/buildbot-compile-and-check/build.sh
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-
-export DOCKER_BUILDKIT=1
-docker build -t sandcastle-checker ../base/
diff --git a/docker/compile-and-check/buildbot-compile-and-check/run.sh b/docker/compile-and-check/buildbot-compile-and-check/run.sh
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-
-docker run -e SANDCASTLE_DEBUG_SHELL=yes -it sandcastle-checker
diff --git a/docker/compile-and-check/config/tags.sh b/docker/compile-and-check/config/tags.sh
@@ -1,5 +1,5 @@
TAG_LIBMHD=v0.9.75
-TAG_GNUNET=v0.19.2
+TAG_GNUNET=v0.19.3
TAG_EXCHANGE=master
TAG_MERCHANT=master
TAG_EXCHANGE=master