summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <grothoff@gnunet.org>2023-12-07 12:25:07 +0900
committerMS <ms@taler.net>2023-12-07 12:45:56 +0100
commit9b5c1b8e397aff00a6e07e86e8ba342b290c1740 (patch)
tree1e054afc5855ca29a2cc3646a8ea847e7444f13f
parentb920c27d202d18073a29bbfb043ec3e52a939c34 (diff)
downloaddeployment-9b5c1b8e397aff00a6e07e86e8ba342b290c1740.tar.gz
deployment-9b5c1b8e397aff00a6e07e86e8ba342b290c1740.tar.bz2
deployment-9b5c1b8e397aff00a6e07e86e8ba342b290c1740.zip
-try setting JAVA_HOME, does not help
-rw-r--r--packaging/debian-docker/Dockerfile8
-rw-r--r--packaging/debian-docker/libeufin-build.sh3
-rw-r--r--packaging/ubuntu-docker/Dockerfile7
-rw-r--r--packaging/ubuntu-docker/libeufin-build.sh3
4 files changed, 13 insertions, 8 deletions
diff --git a/packaging/debian-docker/Dockerfile b/packaging/debian-docker/Dockerfile
index c84f9d1..b667d48 100644
--- a/packaging/debian-docker/Dockerfile
+++ b/packaging/debian-docker/Dockerfile
@@ -47,10 +47,12 @@ COPY anastasis-build.sh /root/
RUN chmod +x /root/anastasis-build.sh
RUN /root/anastasis-build.sh master
+COPY libeufin-build.sh /root/
+RUN chmod +x /root/libeufin-build.sh
+RUN /root/libeufin-build.sh master
+
COPY wallet-build.sh /root/
RUN chmod +x /root/wallet-build.sh
RUN /root/wallet-build.sh master
-COPY libeufin-build.sh /root/
-RUN chmod +x /root/libeufin-build.sh
-RUN /root/libeufin-build.sh master
+
diff --git a/packaging/debian-docker/libeufin-build.sh b/packaging/debian-docker/libeufin-build.sh
index bf47044..9e0a067 100644
--- a/packaging/debian-docker/libeufin-build.sh
+++ b/packaging/debian-docker/libeufin-build.sh
@@ -13,7 +13,8 @@ git clone git://git.taler.net/libeufin
cd libeufin
git checkout $1
./bootstrap
-./configure --prefix=/usr/local
+export JAVA_HOME=/usr
+./configure --prefix=/usr
make deb
cd ..
dpkg -i *.deb
diff --git a/packaging/ubuntu-docker/Dockerfile b/packaging/ubuntu-docker/Dockerfile
index 2207027..d557707 100644
--- a/packaging/ubuntu-docker/Dockerfile
+++ b/packaging/ubuntu-docker/Dockerfile
@@ -47,10 +47,11 @@ COPY anastasis-build.sh /root/
RUN chmod +x /root/anastasis-build.sh
RUN /root/anastasis-build.sh master
+COPY libeufin-build.sh /root/
+RUN chmod +x /root/libeufin-build.sh
+RUN /root/libeufin-build.sh master
+
COPY wallet-build.sh /root/
RUN chmod +x /root/wallet-build.sh
RUN /root/wallet-build.sh master
-COPY libeufin-build.sh /root/
-RUN chmod +x /root/libeufin-build.sh
-RUN /root/libeufin-build.sh master
diff --git a/packaging/ubuntu-docker/libeufin-build.sh b/packaging/ubuntu-docker/libeufin-build.sh
index 7229221..d383625 100644
--- a/packaging/ubuntu-docker/libeufin-build.sh
+++ b/packaging/ubuntu-docker/libeufin-build.sh
@@ -13,7 +13,8 @@ git clone git://git.taler.net/libeufin
cd libeufin
git checkout $1
./bootstrap
-./configure --prefix=/usr/local
+export JAVA_HOME=/usr
+./configure --prefix=/usr
make deb
cd ..
dpkg -i *.deb