From 39444c794e97bc0413d5e6964286085b902b4c01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abel=20Alfonso=20F=C3=ADrvida=20Don=C3=A9stevez?= Date: Wed, 6 Feb 2019 15:01:02 -0500 Subject: [PATCH] Install bash in alpine based images. This fix https://github.com/Mailu/Mailu/issues/918 Bash shell is used by default in Kubernetes' dashboard console, which is very useful for admins. --- core/admin/Dockerfile | 2 +- core/dovecot/Dockerfile | 2 +- core/nginx/Dockerfile | 2 +- core/postfix/Dockerfile | 2 +- optional/clamav/Dockerfile | 2 +- optional/postgresql/Dockerfile | 2 +- optional/radicale/Dockerfile | 2 +- services/fetchmail/Dockerfile | 2 +- services/rspamd/Dockerfile | 2 +- services/unbound/Dockerfile | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/core/admin/Dockerfile b/core/admin/Dockerfile index 4f887ff2..40f9ff59 100644 --- a/core/admin/Dockerfile +++ b/core/admin/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.8 # python3 shared with most images RUN apk add --no-cache \ - python3 py3-pip git \ + python3 py3-pip git bash \ && pip3 install --upgrade pip RUN pip3 install git+https://github.com/usrpro/MailuStart.git#egg=mailustart # Image specific layers under this line diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile index 02c9e49d..94432564 100644 --- a/core/dovecot/Dockerfile +++ b/core/dovecot/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.8 # python3 shared with most images RUN apk add --no-cache \ - python3 py3-pip git \ + python3 py3-pip git bash \ && pip3 install --upgrade pip # Shared layer between rspamd, postfix, dovecot, unbound and nginx RUN pip3 install git+https://github.com/usrpro/MailuStart.git#egg=mailustart diff --git a/core/nginx/Dockerfile b/core/nginx/Dockerfile index 9bc4c745..0156cccf 100644 --- a/core/nginx/Dockerfile +++ b/core/nginx/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.8 # python3 shared with most images RUN apk add --no-cache \ - python3 py3-pip git \ + python3 py3-pip git bash \ && pip3 install --upgrade pip # Shared layer between rspamd, postfix, dovecot, unbound and nginx RUN pip3 install git+https://github.com/usrpro/MailuStart.git#egg=mailustart diff --git a/core/postfix/Dockerfile b/core/postfix/Dockerfile index 4b6c4aee..3eff5218 100644 --- a/core/postfix/Dockerfile +++ b/core/postfix/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.8 # python3 shared with most images RUN apk add --no-cache \ - python3 py3-pip git \ + python3 py3-pip git bash \ && pip3 install --upgrade pip # Shared layer between rspamd, postfix, dovecot, unbound and nginx RUN pip3 install git+https://github.com/usrpro/MailuStart.git#egg=mailustart diff --git a/optional/clamav/Dockerfile b/optional/clamav/Dockerfile index a4a889c7..27254544 100644 --- a/optional/clamav/Dockerfile +++ b/optional/clamav/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.8 # python3 shared with most images RUN apk add --no-cache \ - python3 py3-pip \ + python3 py3-pip bash \ && pip3 install --upgrade pip # Image specific layers under this line RUN apk add --no-cache clamav rsyslog wget clamav-libunrar diff --git a/optional/postgresql/Dockerfile b/optional/postgresql/Dockerfile index 22409597..b03ff2d1 100644 --- a/optional/postgresql/Dockerfile +++ b/optional/postgresql/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.8 # python3 shared with most images RUN apk add --no-cache \ - python3 py3-pip \ + python3 py3-pip bash \ && pip3 install --upgrade pip # Shared layer between rspamd, postfix, dovecot, unbound and nginx RUN pip3 install jinja2 diff --git a/optional/radicale/Dockerfile b/optional/radicale/Dockerfile index 4616d53d..de63daec 100644 --- a/optional/radicale/Dockerfile +++ b/optional/radicale/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:edge RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ - && apk add --no-cache radicale@testing py-dulwich@testing curl + && apk add --no-cache radicale@testing py-dulwich@testing curl bash COPY radicale.conf /radicale.conf diff --git a/services/fetchmail/Dockerfile b/services/fetchmail/Dockerfile index 52f794d5..8e4d5db0 100644 --- a/services/fetchmail/Dockerfile +++ b/services/fetchmail/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.8 # python3 shared with most images RUN apk add --no-cache \ - python3 py3-pip \ + python3 py3-pip bash \ && pip3 install --upgrade pip # Image specific layers under this line RUN apk add --no-cache fetchmail ca-certificates \ diff --git a/services/rspamd/Dockerfile b/services/rspamd/Dockerfile index 32e93fac..70e6286d 100644 --- a/services/rspamd/Dockerfile +++ b/services/rspamd/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.8 # python3 shared with most images RUN apk add --no-cache \ - python3 py3-pip git \ + python3 py3-pip git bash \ && pip3 install --upgrade pip # Shared layer between rspamd, postfix, dovecot, unbound and nginx RUN pip3 install git+https://github.com/usrpro/MailuStart.git#egg=mailustart diff --git a/services/unbound/Dockerfile b/services/unbound/Dockerfile index 9d40b691..325584fd 100644 --- a/services/unbound/Dockerfile +++ b/services/unbound/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.8 # python3 shared with most images RUN apk add --no-cache \ - python3 py3-pip git \ + python3 py3-pip git bash \ && pip3 install --upgrade pip # Shared layer between rspamd, postfix, dovecot, unbound and nginx RUN pip3 install git+https://github.com/usrpro/MailuStart.git#egg=mailustart