diff options
| author | Philipp Hofmann <foss.github@pnhofmann.de> | 2018-08-20 16:38:51 +0200 |
|---|---|---|
| committer | Philipp Hofmann <foss.github@pnhofmann.de> | 2018-08-23 13:33:31 +0200 |
| commit | 04c95843266c0cf5c0e81786278a1b92417c4dde (patch) | |
| tree | 19a929e734d800690b766352d689bb48f01bdc8e /docker | |
| parent | 3121825fba1b3583321242fbe0de09eaf1973125 (diff) | |
Docker: merge RUN instructions for less layer (-3)
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 12 | ||||
| -rw-r--r-- | docker/Dockerfile.alpine | 12 |
2 files changed, 10 insertions, 14 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index ff899f890..9e5cd690a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -32,17 +32,15 @@ RUN apt-get update && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* +RUN \ # Set initial admin password : "docker" (encoded with custom yacy md5 function net.yacy.cora.order.Digest.encodeMD5Hex()) -RUN sed -i "/adminAccountBase64MD5=/c\adminAccountBase64MD5=MD5:e672161ffdce91be4678605f4f4e6786" /opt/yacy_search_server/defaults/yacy.init - + sed -i "/adminAccountBase64MD5=/c\adminAccountBase64MD5=MD5:e672161ffdce91be4678605f4f4e6786" /opt/yacy_search_server/defaults/yacy.init && \ # Intially enable HTTPS : this is the most secure option for remote administrator authentication -RUN sed -i "/server.https=false/c\server.https=true" /opt/yacy_search_server/defaults/yacy.init - + sed -i "/server.https=false/c\server.https=true" /opt/yacy_search_server/defaults/yacy.init && \ # Create user and group yacy : this user will be used to run YaCy main process -RUN adduser --system --group --no-create-home --disabled-password yacy - + adduser --system --group --no-create-home --disabled-password yacy && \ # Set ownership of yacy install directory to yacy user/group -RUN chown yacy:yacy -R /opt/yacy_search_server + chown yacy:yacy -R /opt/yacy_search_server # Expose HTTP and HTTPS default ports EXPOSE 8090 8443 diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine index 3f023f022..b6d7acede 100644 --- a/docker/Dockerfile.alpine +++ b/docker/Dockerfile.alpine @@ -61,17 +61,15 @@ RUN apk add --no-cache git && \ rm -rf /opt/ant && \ apk del git +RUN \ # Set initial admin password : "docker" (encoded with custom yacy md5 function net.yacy.cora.order.Digest.encodeMD5Hex()) -RUN sed -i "/adminAccountBase64MD5=/c\adminAccountBase64MD5=MD5:e672161ffdce91be4678605f4f4e6786" /opt/yacy_search_server/defaults/yacy.init - + sed -i "/adminAccountBase64MD5=/c\adminAccountBase64MD5=MD5:e672161ffdce91be4678605f4f4e6786" /opt/yacy_search_server/defaults/yacy.init && \ # Intially enable HTTPS : this is the most secure option for remote administrator authentication -RUN sed -i "/server.https=false/c\server.https=true" /opt/yacy_search_server/defaults/yacy.init - + sed -i "/server.https=false/c\server.https=true" /opt/yacy_search_server/defaults/yacy.init && \ # Create user and group yacy : this user will be used to run YaCy main process -RUN addgroup yacy && adduser -S -G yacy -H -D yacy - + addgroup yacy && adduser -S -G yacy -H -D yacy && \ # Set ownership of yacy install directory to yacy user/group -RUN chown yacy:yacy -R /opt/yacy_search_server + chown yacy:yacy -R /opt/yacy_search_server # Expose HTTP and HTTPS default ports EXPOSE 8090 8443 |