From 2049795cad77ba6127bca1f0163e2c4afed7027b Mon Sep 17 00:00:00 2001 From: Jaromil Date: Tue, 25 Sep 2018 16:09:34 +0200 Subject: [PATCH 1/3] docker do not upgrade packages --- docker-sdk/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-sdk/Dockerfile b/docker-sdk/Dockerfile index 2d403e7..a00d280 100644 --- a/docker-sdk/Dockerfile +++ b/docker-sdk/Dockerfile @@ -44,8 +44,10 @@ RUN apt-key add nodesource.gpg.key RUN echo "deb https://deb.nodesource.com/node_8.x $debian main" \ >> /etc/apt/sources.list +# && apt-get -yy update && apt-get -yy upgrade \ + RUN mkdir -p /usr/share/man/man1/ \ - && apt-get -yy update && apt-get -yy upgrade \ + && apt-get -yy update \ && apt-get -yy install tor deb.torproject.org-keyring \ supervisor daemontools \ tmux curl redis-tools redis-server net-tools \ From ceda189eb01568c1e01de6b3e4becc87d58a6a73 Mon Sep 17 00:00:00 2001 From: parazyd Date: Tue, 25 Sep 2018 15:24:45 +0200 Subject: [PATCH 2/3] Dockerfile: Use long options with apt. This is needed for the Devuan sdk, since it somehow bugs out on short options, and with usage of -q. Also, no flags are needed for 'apt-get update' so they are removed as well. --- docker-sdk/Dockerfile | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/docker-sdk/Dockerfile b/docker-sdk/Dockerfile index a00d280..8a86759 100644 --- a/docker-sdk/Dockerfile +++ b/docker-sdk/Dockerfile @@ -27,8 +27,8 @@ ENV BUILD_DEPS="build-essential zlib1g-dev gcc make autoconf automake pkg-config WORKDIR /root # # debugging travis (finds gpg in local builds) -RUN apt-get -yq update \ -&& apt-get -yq install gnupg1 ca-certificates --no-install-recommends \ +RUN apt-get update \ +&& apt-get --yes --force-yes install gnupg1 ca-certificates --no-install-recommends \ && echo "ENVIRONMENT VARIABLES:" \ && export @@ -44,16 +44,14 @@ RUN apt-key add nodesource.gpg.key RUN echo "deb https://deb.nodesource.com/node_8.x $debian main" \ >> /etc/apt/sources.list -# && apt-get -yy update && apt-get -yy upgrade \ - RUN mkdir -p /usr/share/man/man1/ \ - && apt-get -yy update \ - && apt-get -yy install tor deb.torproject.org-keyring \ + && apt-get update \ + && apt-get --yes --force-yes install tor deb.torproject.org-keyring \ supervisor daemontools \ tmux curl redis-tools redis-server net-tools \ python3 python3-stem nodejs -RUN apt-get -yq install $BUILD_DEPS +RUN apt-get --yes --force-yes install $BUILD_DEPS # Latest Zenroom built static for x86-amd64 taken from our own builds at Dyne.org ADD $DYNESDK/zenroom-static-amd64/lastSuccessfulBuild/artifact/src/zenroom-static /usr/bin/zenroom @@ -97,12 +95,12 @@ ADD https://openresty.org/package/pubkey.gpg openresty.gpg RUN apt-key add openresty.gpg RUN echo "deb http://openresty.org/package/debian stretch openresty" \ >> /etc/apt/sources.list -RUN apt-get -yq update \ -&& apt-get -yq install --no-install-recommends openresty +RUN apt-get update \ +&& apt-get --yes --force-yes install --no-install-recommends openresty # cleanup -RUN apt-get -yq remove --purge $BUILD_DEPS \ -&& apt-get -yq --purge autoremove && apt-get -yq clean \ +RUN apt-get --yes --force-yes purge $BUILD_DEPS \ +&& apt-get --yes --force-yes --purge autoremove && apt-get clean \ && npm cache clean --force && npm uninstall -g npm COPY supervisord.conf /etc/supervisor/supervisord.conf From d068a8892f75335798bc7267dc18e69224dbe0ab Mon Sep 17 00:00:00 2001 From: parazyd Date: Tue, 25 Sep 2018 15:27:52 +0200 Subject: [PATCH 3/3] Dockerfile: Use ADD instead of COPY. This is used temporarily and could possibly be reverted once this logic is implemented in the Devuan sdk. --- docker-sdk/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker-sdk/Dockerfile b/docker-sdk/Dockerfile index 8a86759..cdc375b 100644 --- a/docker-sdk/Dockerfile +++ b/docker-sdk/Dockerfile @@ -33,7 +33,7 @@ RUN apt-get update \ && export # Tor repository -COPY tor.pub.asc tor.pub.asc +ADD https://raw.githubusercontent.com/DECODEproject/decode-os/master/docker-sdk/tor.pub.asc tor.pub.asc RUN apt-key add tor.pub.asc RUN echo "deb https://deb.torproject.org/torproject.org $debian main" \ >> /etc/apt/sources.list @@ -103,7 +103,8 @@ RUN apt-get --yes --force-yes purge $BUILD_DEPS \ && apt-get --yes --force-yes --purge autoremove && apt-get clean \ && npm cache clean --force && npm uninstall -g npm -COPY supervisord.conf /etc/supervisor/supervisord.conf +ADD https://raw.githubusercontent.com/DECODEproject/decode-os/master/docker-sdk/supervisord.conf \ + /etc/supervisor/supervisord.conf RUN sed -i "s/nodaemon=true/nodaemon=$foreground/" /etc/supervisor/supervisord.conf RUN groupadd -g 6000 app && useradd -r -u 6000 -g app -d /home/app app