[taler-deployment] 02/02: -try setting JAVA_HOME, does not help

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository deployment.

commit e41d25a66a98da6b21aa5d981b51cc8090000446
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Thu Dec 7 12:25:07 2023 +0900

    -try setting JAVA_HOME, does not help
---
 packaging/debian-docker/Dockerfile        | 8 +++++---
 packaging/debian-docker/libeufin-build.sh | 3 ++-
 packaging/ubuntu-docker/Dockerfile        | 7 ++++---
 packaging/ubuntu-docker/libeufin-build.sh | 3 ++-
 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

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.