From a9458f526524fee8474f67b1999d49000a0e5fbf Mon Sep 17 00:00:00 2001
From: nachoparker <nacho@ownyourbits.com>
Date: Thu, 5 Apr 2018 18:49:05 +0200
Subject: renamed to NextCloudPlus

---
 docker/devel/Dockerfile         |  4 +-
 docker/nextcloud/Dockerfile     |  2 +-
 docker/nextcloudpi/Dockerfile   | 88 -----------------------------------------
 docker/nextcloudplus/Dockerfile | 88 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 91 insertions(+), 91 deletions(-)
 delete mode 100644 docker/nextcloudpi/Dockerfile
 create mode 100644 docker/nextcloudplus/Dockerfile

(limited to 'docker')

diff --git a/docker/devel/Dockerfile b/docker/devel/Dockerfile
index 277d87fa..ce65fa97 100644
--- a/docker/devel/Dockerfile
+++ b/docker/devel/Dockerfile
@@ -1,4 +1,4 @@
-FROM ownyourbits/nextcloudpi-x86
+FROM ownyourbits/nextcloudplus-x86
 
 MAINTAINER Ignacio Núñez Hernanz <nacho@ownyourbits.com>
 
@@ -12,7 +12,7 @@ RUN \
 apt-get update; \
 apt-get install --no-install-recommends -y wget ca-certificates git; \
 
-# install nextcloudpi devel
+# install nextcloudplus devel
 source /usr/local/etc/library.sh; \
 set +x; \
 cd /usr/local/etc/; \
diff --git a/docker/nextcloud/Dockerfile b/docker/nextcloud/Dockerfile
index 483aa6f1..214bd74b 100644
--- a/docker/nextcloud/Dockerfile
+++ b/docker/nextcloud/Dockerfile
@@ -7,7 +7,7 @@ SHELL ["/bin/bash", "-c"]
 ENV DOCKERBUILD 1
 
 COPY etc/library.sh /usr/local/etc/
-COPY etc/nextcloudpi-config.d/nc-init.sh etc/nextcloudpi-config.d/nc-nextcloud.sh /
+COPY etc/ncp-config.d/nc-init.sh etc/ncp-config.d/nc-nextcloud.sh /
 
 RUN \
 
diff --git a/docker/nextcloudpi/Dockerfile b/docker/nextcloudpi/Dockerfile
deleted file mode 100644
index 47574507..00000000
--- a/docker/nextcloudpi/Dockerfile
+++ /dev/null
@@ -1,88 +0,0 @@
-FROM ownyourbits/nextcloud-x86
-
-MAINTAINER Ignacio Núñez Hernanz <nacho@ownyourbits.com>
-
-SHELL ["/bin/bash", "-c"]
-
-ENV DOCKERBUILD 1
-
-COPY nextcloudpi.sh /usr/local/etc/
-
-RUN \
-
-# mark as image build
-touch /.ncp-image; \
-
-# mark as docker image
-touch /.docker-image; \
-
-apt-get update; \
-apt-get install --no-install-recommends -y wget ca-certificates; \
-      
-# install nextcloudpi
-source /usr/local/etc/library.sh; \
-set +x; \
-cd /usr/local/etc/; \
-install_script nextcloudpi.sh; \
-
-# fix default paths
-sed -i 's|/media/USBdrive|/data/backups|' nextcloudpi-config.d/nc-backup.sh; \
-
-# specific cleanup
-rm /usr/local/etc/nextcloudpi.sh; \
-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 \
-    binutils \
-    cpp \
-    cpp-6 \
-    gcc \
-    gcc-6 \
-    libasan3 \
-    libaugeas0 \
-    libc-dev-bin \
-    libc6-dev \
-    libcc1-0 \
-    libcilkrts5 \
-    libexpat1-dev \
-    libffi-dev \
-    libgcc-6-dev \
-    libgomp1 \
-    libisl15 \
-    libitm1 \
-    liblsan0 \
-    libmpc3 \
-    libmpx2 \
-    libquadmath0 \
-    libtsan0 \
-    libubsan0 \
-    linux-libc-dev \
-    python-virtualenv \
-    python-pkg-resources \
-    python3-pkg-resources \
-    python3-virtualenv \
-    virtualenv; \
-
-# package clean up
-apt-get autoremove -y; \
-apt-get clean; \
-rm -f /var/lib/apt/lists/*; \
-rm -rf /usr/share/man/*; \
-rm -rf /usr/share/doc/*; \
-rm -f /var/log/alternatives.log /var/log/apt/*; \
-rm /var/cache/debconf/*-old; 
-
-COPY docker-common/nextcloudpi/000ncp /etc/services-enabled.d/
-
-# 4443 - ncp-web
-EXPOSE 80 443 4443
diff --git a/docker/nextcloudplus/Dockerfile b/docker/nextcloudplus/Dockerfile
new file mode 100644
index 00000000..a75ef835
--- /dev/null
+++ b/docker/nextcloudplus/Dockerfile
@@ -0,0 +1,88 @@
+FROM ownyourbits/nextcloud-x86
+
+MAINTAINER Ignacio Núñez Hernanz <nacho@ownyourbits.com>
+
+SHELL ["/bin/bash", "-c"]
+
+ENV DOCKERBUILD 1
+
+COPY nextcloudplus.sh /usr/local/etc/
+
+RUN \
+
+# mark as image build
+touch /.ncp-image; \
+
+# mark as docker image
+touch /.docker-image; \
+
+apt-get update; \
+apt-get install --no-install-recommends -y wget ca-certificates; \
+      
+# install nextcloudplus
+source /usr/local/etc/library.sh; \
+set +x; \
+cd /usr/local/etc/; \
+install_script nextcloudplus.sh; \
+
+# fix default paths
+sed -i 's|/media/USBdrive|/data/backups|' ncp-config.d/nc-backup.sh; \
+
+# specific cleanup
+rm /usr/local/etc/nextcloudplus.sh; \
+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/ncp-config.d/; \
+for script in *.sh; do cleanup_script $script; done; \
+
+# letsencrypt build artifacts cleanup
+apt-get purge -y \
+    make \
+    binutils \
+    cpp \
+    cpp-6 \
+    gcc \
+    gcc-6 \
+    libasan3 \
+    libaugeas0 \
+    libc-dev-bin \
+    libc6-dev \
+    libcc1-0 \
+    libcilkrts5 \
+    libexpat1-dev \
+    libffi-dev \
+    libgcc-6-dev \
+    libgomp1 \
+    libisl15 \
+    libitm1 \
+    liblsan0 \
+    libmpc3 \
+    libmpx2 \
+    libquadmath0 \
+    libtsan0 \
+    libubsan0 \
+    linux-libc-dev \
+    python-virtualenv \
+    python-pkg-resources \
+    python3-pkg-resources \
+    python3-virtualenv \
+    virtualenv; \
+
+# package clean up
+apt-get autoremove -y; \
+apt-get clean; \
+rm -f /var/lib/apt/lists/*; \
+rm -rf /usr/share/man/*; \
+rm -rf /usr/share/doc/*; \
+rm -f /var/log/alternatives.log /var/log/apt/*; \
+rm /var/cache/debconf/*-old; 
+
+COPY docker-common/nextcloudplus/000ncp /etc/services-enabled.d/
+
+# 4443 - ncp-web
+EXPOSE 80 443 4443
-- 
cgit v1.2.3