diff options
| author | Christian Grothoff <christian@grothoff.org> | 2023-09-24 21:49:54 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2023-09-24 21:49:58 +0200 |
| commit | 2e7113a31fb4071c31145be48de86653bc92c34e (patch) | |
| tree | d18c85d9eb31c63d4c66fceceedfc05be77ab45a | |
| parent | b7f8a16c8878fbc329324519fd3d70231499f801 (diff) | |
| download | deployment-2e7113a31fb4071c31145be48de86653bc92c34e.tar.gz deployment-2e7113a31fb4071c31145be48de86653bc92c34e.tar.bz2 deployment-2e7113a31fb4071c31145be48de86653bc92c34e.zip | |
update package build rules
| -rw-r--r-- | packaging/debian-docker/Dockerfile | 8 | ||||
| -rw-r--r-- | packaging/ubuntu-docker/Dockerfile | 10 | ||||
| -rw-r--r-- | packaging/ubuntu-docker/exchange-build.sh | 2 | ||||
| -rw-r--r-- | packaging/ubuntu-docker/gnunet-build.sh | 2 | ||||
| -rw-r--r-- | packaging/ubuntu-jammy-docker/Dockerfile | 9 |
5 files changed, 16 insertions, 15 deletions
diff --git a/packaging/debian-docker/Dockerfile b/packaging/debian-docker/Dockerfile index f463bad..5a93882 100644 --- a/packaging/debian-docker/Dockerfile +++ b/packaging/debian-docker/Dockerfile @@ -31,10 +31,6 @@ COPY gnunet-gtk-build.sh /root/ RUN chmod +x /root/gnunet-gtk-build.sh RUN /root/gnunet-gtk-build.sh master -COPY libeufin-build.sh /root/ -RUN chmod +x /root/libeufin-build.sh -RUN /root/libeufin-build.sh master - COPY exchange-build.sh /root/ RUN chmod +x /root/exchange-build.sh RUN /root/exchange-build.sh master @@ -54,3 +50,7 @@ RUN /root/anastasis-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/Dockerfile b/packaging/ubuntu-docker/Dockerfile index d2e4ebf..2207027 100644 --- a/packaging/ubuntu-docker/Dockerfile +++ b/packaging/ubuntu-docker/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:kinetic +FROM ubuntu:lunar # This file is in the public domain. # # Docker image to build Ubuntu packages of @@ -31,10 +31,6 @@ COPY gnunet-gtk-build.sh /root/ RUN chmod +x /root/gnunet-gtk-build.sh RUN /root/gnunet-gtk-build.sh master -COPY libeufin-build.sh /root/ -RUN chmod +x /root/libeufin-build.sh -RUN /root/libeufin-build.sh master - COPY exchange-build.sh /root/ RUN chmod +x /root/exchange-build.sh RUN /root/exchange-build.sh master @@ -54,3 +50,7 @@ RUN /root/anastasis-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/exchange-build.sh b/packaging/ubuntu-docker/exchange-build.sh index 36b9ede..b4a0115 100644 --- a/packaging/ubuntu-docker/exchange-build.sh +++ b/packaging/ubuntu-docker/exchange-build.sh @@ -10,7 +10,7 @@ cd /build/taler # Fetch source rm -rf * -pip3 install htmlark +pip3 install --break-system-packages htmlark git clone git://git.taler.net/exchange cd exchange diff --git a/packaging/ubuntu-docker/gnunet-build.sh b/packaging/ubuntu-docker/gnunet-build.sh index 896bdcf..72f07ba 100644 --- a/packaging/ubuntu-docker/gnunet-build.sh +++ b/packaging/ubuntu-docker/gnunet-build.sh @@ -11,7 +11,7 @@ cd /build/gnunet # Fetch source rm -rf * -pip3 install sphinx-book-theme +pip3 install --break-system-packages sphinx-book-theme for n in gnunet do diff --git a/packaging/ubuntu-jammy-docker/Dockerfile b/packaging/ubuntu-jammy-docker/Dockerfile index a4a309b..1a3e842 100644 --- a/packaging/ubuntu-jammy-docker/Dockerfile +++ b/packaging/ubuntu-jammy-docker/Dockerfile @@ -31,10 +31,6 @@ COPY gnunet-gtk-build.sh /root/ RUN chmod +x /root/gnunet-gtk-build.sh RUN /root/gnunet-gtk-build.sh master -COPY libeufin-build.sh /root/ -RUN chmod +x /root/libeufin-build.sh -RUN /root/libeufin-build.sh master - COPY exchange-build.sh /root/ RUN chmod +x /root/exchange-build.sh RUN /root/exchange-build.sh master @@ -51,6 +47,11 @@ COPY anastasis-build.sh /root/ RUN chmod +x /root/anastasis-build.sh RUN /root/anastasis-build.sh master +# No wallet on Jammy #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 |