aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian@dold.me>2023-10-06 02:42:06 +0200
committerFlorian Dold <florian@dold.me>2023-10-06 02:42:06 +0200
commit213814a6f46d0e0bcb4b51b46f734bf3225b5d0e (patch)
treea35df7b4f1396e47e34c794f1799d1a682df6de6
parent13390e3881d9778e803849201210d677e582b6d3 (diff)
downloaddeployment-213814a6f46d0e0bcb4b51b46f734bf3225b5d0e.tar.gz
deployment-213814a6f46d0e0bcb4b51b46f734bf3225b5d0e.tar.bz2
deployment-213814a6f46d0e0bcb4b51b46f734bf3225b5d0e.zip
WIP
-rw-r--r--sandcastle/buildconfig/libeufin.tag2
-rw-r--r--sandcastle/images/base/Dockerfile3
-rwxr-xr-xsandcastle/run-container2
3 files changed, 4 insertions, 3 deletions
diff --git a/sandcastle/buildconfig/libeufin.tag b/sandcastle/buildconfig/libeufin.tag
index fb2715c..70e898a 100644
--- a/sandcastle/buildconfig/libeufin.tag
+++ b/sandcastle/buildconfig/libeufin.tag
@@ -1 +1 @@
-v0.9.3-dev.16
+v0.9.3-dev.18
diff --git a/sandcastle/images/base/Dockerfile b/sandcastle/images/base/Dockerfile
index b967601..31a22c1 100644
--- a/sandcastle/images/base/Dockerfile
+++ b/sandcastle/images/base/Dockerfile
@@ -123,9 +123,10 @@ COPY buildconfig/libeufin.tag /buildconfig/
RUN TAG=$(cat /buildconfig/libeufin.tag) && \
git clone git://git.taler.net/libeufin \
--branch $TAG
+RUN apt-get install -y default-jre-headless
WORKDIR /build/libeufin
RUN ./bootstrap
-RUN ./gradlew distZip
+RUN ./configure --prefix=/usr
RUN dpkg-buildpackage -rfakeroot -b -uc -us
WORKDIR /
RUN mkdir -p /packages/libeufin
diff --git a/sandcastle/run-container b/sandcastle/run-container
index 6f5d42a..f2fbca5 100755
--- a/sandcastle/run-container
+++ b/sandcastle/run-container
@@ -5,4 +5,4 @@
# We need to be careful with SELinux when using volume mounts, relabel!
-exec podman run --systemd=always -v talerdata:/talerdata:Z -v $PWD/scripts:/scripts:Z -v $PWD/config:/config:Z --name taler-sandcastle "$@" taler-base-all
+exec podman run --systemd=always -v talerdata:/talerdata:Z -v $PWD/scripts:/scripts:Z -v $PWD/config:/config:Z "$@" taler-base-all