diff options
| author | nachoparker <nacho@ownyourbits.com> | 2018-02-08 16:11:15 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2018-02-09 11:16:25 +0300 |
| commit | 07b38cb240768873722824fcd3f343b06f90e06a (patch) | |
| tree | 4aa241d3d86a64939f6f83cf831f9ca98d7ef6bf /docker/nextcloudpi | |
| parent | fc0d3f96f246fe179b626c143c138a17b08fcf8b (diff) | |
docker: fixes in build process for NC13 version
Diffstat (limited to 'docker/nextcloudpi')
| -rw-r--r-- | docker/nextcloudpi/Dockerfile | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/docker/nextcloudpi/Dockerfile b/docker/nextcloudpi/Dockerfile index d80ec758..834669ed 100644 --- a/docker/nextcloudpi/Dockerfile +++ b/docker/nextcloudpi/Dockerfile @@ -9,6 +9,7 @@ ENV DOCKERBUILD 1 COPY nextcloudpi.sh /usr/local/etc/ RUN \ + # mark as image build touch /.ncp-image; \ @@ -31,11 +32,15 @@ rm /.ncp-image; \ # remove wizard for now rm -r /var/www/ncp-web/wizard; \ +# cleanup all NCP extras +source /usr/local/etc/library.sh; \ +cd /usr/local/etc/nextcloudpi-config.d/; \ +for script in *.sh; do cleanup_script $script; done; \ + # letsencrypt build artifacts cleanup apt-get purge -y \ make \ git \ - augeas-lenses \ binutils \ cpp \ cpp-6 \ @@ -56,21 +61,15 @@ apt-get purge -y \ liblsan0 \ libmpc3 \ libmpx2 \ - libpython-dev \ - libpython2.7-dev \ libquadmath0 \ - libssl-dev \ libtsan0 \ libubsan0 \ linux-libc-dev \ - python-dev \ python-virtualenv \ - python2.7-dev \ python-pkg-resources \ python3-pkg-resources \ python3-virtualenv \ - virtualenv \ - python-pip-whl; \ + virtualenv; \ # package clean up apt-get autoremove -y; \ |