[taler-deployment] branch master updated (62bef2b -> bbb840a)

[gnunet]

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

devan-carpenter pushed a change to branch master
in repository deployment.

    from 62bef2b  sandcastle-ng: bump wallet version
     new ecf1367  sandcastle-ng: do not install recommended apt deps
     new bbb840a  sandcastle-ng: ensure apache2 is disabled

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 sandcastle-ng/Dockerfile | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/sandcastle-ng/Dockerfile b/sandcastle-ng/Dockerfile
index 9feba8d..dcd4c01 100644
--- a/sandcastle-ng/Dockerfile
+++ b/sandcastle-ng/Dockerfile
@@ -82,7 +82,7 @@ WORKDIR /
 RUN mkdir -p /packages/gnunet
 RUN mv /build/*.deb /packages/gnunet
 RUN rm -rf /build
-RUN apt-get install -y /packages/gnunet/*.deb
+RUN apt-get install --no-install-recommends -y /packages/gnunet/*.deb
 WORKDIR /
 
 # Exchange
@@ -100,7 +100,7 @@ WORKDIR /
 RUN mkdir -p /packages/exchange
 RUN mv /build/*.deb /packages/exchange
 RUN rm -rf /build
-RUN apt-get install -y /packages/exchange/*.deb
+RUN apt-get install --no-install-recommends -y /packages/exchange/*.deb
 WORKDIR /
 
 # Merchant
@@ -118,7 +118,7 @@ WORKDIR /
 RUN mkdir -p /packages/merchant
 RUN mv /build/*.deb /packages/merchant
 RUN rm -rf /build
-RUN apt-get install -y /packages/merchant/*.deb
+RUN apt-get install --no-install-recommends -y /packages/merchant/*.deb
 WORKDIR /
 
 # Libeufin
@@ -137,7 +137,7 @@ WORKDIR /
 RUN mkdir -p /packages/libeufin
 RUN mv /build/*.deb /packages/libeufin
 RUN rm -rf /build
-RUN apt-get install -y /packages/libeufin/*.deb
+RUN apt-get install --no-install-recommends -y /packages/libeufin/*.deb
 
 # Merchant demos
 FROM base-system as merchant-demos
@@ -154,7 +154,7 @@ WORKDIR /
 RUN mkdir -p /packages/merchant-demos
 RUN mv /build/*.deb /packages/merchant-demos
 RUN rm -rf /build
-RUN apt-get install -y /packages/merchant-demos/*.deb
+RUN apt-get install --no-install-recommends -y /packages/merchant-demos/*.deb
 
 # wallet-core tools (taler-wallet-cli and taler-harness)
 FROM base-system as wallet
@@ -182,7 +182,7 @@ WORKDIR /
 RUN mkdir -p /packages/wallet
 RUN mv /build/wallet-core/packages/*.deb /packages/wallet
 RUN rm -rf /build
-RUN apt-get install -y /packages/wallet/*.deb
+RUN apt-get install --no-install-recommends -y /packages/wallet/*.deb
 
 # Sync
 FROM merchant as sync
@@ -198,7 +198,7 @@ WORKDIR /
 RUN mkdir -p /packages/sync
 RUN mv /build/*.deb /packages/sync
 RUN rm -rf /build
-RUN apt-get install -y /packages/sync/*.deb
+RUN apt-get install --no-install-recommends -y /packages/sync/*.deb
 WORKDIR /
 
 
@@ -230,7 +230,9 @@ COPY --from=merchant /packages/merchant/* /packages/
 COPY --from=wallet /packages/wallet/* /packages/
 COPY --from=libeufin /packages/libeufin/* /packages/
 COPY --from=merchant-demos /packages/merchant-demos/* /packages/
-RUN apt-get install -y /packages/*.deb
+RUN apt-get install --no-install-recommends -y /packages/*.deb
 COPY systemd/setup-sandcastle.service /etc/systemd/system/
 RUN systemctl enable setup-sandcastle.service
-RUN systemctl disable postgresql
+# Disable potentially problem-causing services
+RUN systemctl disable postgresql && \
+    systemctl disable apache2 || true

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