diff options
author | Tilo Spannagel <development@tilosp.de> | 2019-11-06 19:03:08 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-06 19:03:08 +0100 |
commit | 6a173a4daa6962410f69a2b6b01520508b63861a (patch) | |
tree | dbc531680a8c0b2fe6c2d97916e0487727d1206e /.examples | |
parent | d5ecc2149f857c8524a30cc43972dd2279471ec5 (diff) | |
parent | 23b14887884c2572a9ff2b5ed7a0fdff5bd6c707 (diff) |
Merge pull request #916 from J0WI/procps
Add procps to smb examples (closes #557)
Diffstat (limited to '.examples')
-rw-r--r-- | .examples/dockerfiles/full/apache/Dockerfile | 1 | ||||
-rw-r--r-- | .examples/dockerfiles/full/fpm-alpine/Dockerfile | 1 | ||||
-rw-r--r-- | .examples/dockerfiles/full/fpm/Dockerfile | 1 | ||||
-rw-r--r-- | .examples/dockerfiles/smb/apache/Dockerfile | 2 | ||||
-rw-r--r-- | .examples/dockerfiles/smb/fpm-alpine/Dockerfile | 2 | ||||
-rw-r--r-- | .examples/dockerfiles/smb/fpm/Dockerfile | 2 |
6 files changed, 6 insertions, 3 deletions
diff --git a/.examples/dockerfiles/full/apache/Dockerfile b/.examples/dockerfiles/full/apache/Dockerfile index bd759168..eff7c40c 100644 --- a/.examples/dockerfiles/full/apache/Dockerfile +++ b/.examples/dockerfiles/full/apache/Dockerfile @@ -6,6 +6,7 @@ RUN set -ex; \ apt-get install -y --no-install-recommends \ ffmpeg \ libmagickcore-6.q16-3-extra \ + procps \ smbclient \ supervisor \ # libreoffice \ diff --git a/.examples/dockerfiles/full/fpm-alpine/Dockerfile b/.examples/dockerfiles/full/fpm-alpine/Dockerfile index bbc8b98e..2603d802 100644 --- a/.examples/dockerfiles/full/fpm-alpine/Dockerfile +++ b/.examples/dockerfiles/full/fpm-alpine/Dockerfile @@ -5,6 +5,7 @@ RUN set -ex; \ apk add --no-cache \ ffmpeg \ imagemagick \ + procps \ samba-client \ supervisor \ # libreoffice \ diff --git a/.examples/dockerfiles/full/fpm/Dockerfile b/.examples/dockerfiles/full/fpm/Dockerfile index 0fa2ccbf..abc07179 100644 --- a/.examples/dockerfiles/full/fpm/Dockerfile +++ b/.examples/dockerfiles/full/fpm/Dockerfile @@ -6,6 +6,7 @@ RUN set -ex; \ apt-get install -y --no-install-recommends \ ffmpeg \ libmagickcore-6.q16-3-extra \ + procps \ smbclient \ supervisor \ # libreoffice \ diff --git a/.examples/dockerfiles/smb/apache/Dockerfile b/.examples/dockerfiles/smb/apache/Dockerfile index 8ea3f770..a884ffb3 100644 --- a/.examples/dockerfiles/smb/apache/Dockerfile +++ b/.examples/dockerfiles/smb/apache/Dockerfile @@ -1,3 +1,3 @@ FROM nextcloud:apache -RUN apt-get update && apt-get install -y smbclient && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y procps smbclient && rm -rf /var/lib/apt/lists/* diff --git a/.examples/dockerfiles/smb/fpm-alpine/Dockerfile b/.examples/dockerfiles/smb/fpm-alpine/Dockerfile index a66cd93a..0577777d 100644 --- a/.examples/dockerfiles/smb/fpm-alpine/Dockerfile +++ b/.examples/dockerfiles/smb/fpm-alpine/Dockerfile @@ -1,3 +1,3 @@ FROM nextcloud:fpm-alpine -RUN apk add --no-cache samba-client +RUN apk add --no-cache procps samba-client diff --git a/.examples/dockerfiles/smb/fpm/Dockerfile b/.examples/dockerfiles/smb/fpm/Dockerfile index 4c99b863..417565f7 100644 --- a/.examples/dockerfiles/smb/fpm/Dockerfile +++ b/.examples/dockerfiles/smb/fpm/Dockerfile @@ -1,3 +1,3 @@ FROM nextcloud:fpm -RUN apt-get update && apt-get install -y smbclient && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y procps smbclient && rm -rf /var/lib/apt/lists/* |