diff options
| author | nachoparker <nacho@ownyourbits.com> | 2018-03-29 05:42:53 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2018-03-29 05:42:53 +0300 |
| commit | f31caf4d0411423230c58cbfed04072bea0a2d2e (patch) | |
| tree | 250820ae69cb905618d7aad906bfb4c726e726d7 | |
| parent | 3fee3bb46fd4f81d360ab5008f2be84659b66464 (diff) | |
docker fix development environment first initialization
| -rwxr-xr-x | docker-common/nextcloud/020nextcloud | 3 | ||||
| -rw-r--r-- | docker/nextcloud/Dockerfile | 9 |
2 files changed, 6 insertions, 6 deletions
diff --git a/docker-common/nextcloud/020nextcloud b/docker-common/nextcloud/020nextcloud index 3f5fa761..75c2dcdc 100755 --- a/docker-common/nextcloud/020nextcloud +++ b/docker-common/nextcloud/020nextcloud @@ -36,8 +36,7 @@ postfix start test -f /data/app/config/config.php || { echo "Uninitialized instance, running nc-init..." source /usr/local/etc/library.sh - cd /usr/local/etc/ - activate_script nc-init.sh + activate_script /nc-init.sh } # Trusted Domain ( local IP ) diff --git a/docker/nextcloud/Dockerfile b/docker/nextcloud/Dockerfile index f063831f..f2dd4e4e 100644 --- a/docker/nextcloud/Dockerfile +++ b/docker/nextcloud/Dockerfile @@ -6,7 +6,8 @@ SHELL ["/bin/bash", "-c"] ENV DOCKERBUILD 1 -COPY etc/library.sh etc/nextcloudpi-config.d/nc-init.sh etc/nextcloudpi-config.d/nc-nextcloud.sh /usr/local/etc/ +COPY etc/library.sh /usr/local/etc/ +COPY etc/nextcloudpi-config.d/nc-init.sh etc/nextcloudpi-config.d/nc-nextcloud.sh / RUN \ @@ -15,8 +16,8 @@ apt-get update; \ apt-get install --no-install-recommends -y wget ca-certificates sudo; \ source /usr/local/etc/library.sh; \ set +x; \ -install_script /usr/local/etc/nc-nextcloud.sh; \ -activate_script /usr/local/etc/nc-nextcloud.sh; \ +install_script /nc-nextcloud.sh; \ +activate_script /nc-nextcloud.sh; \ mv /var/www/nextcloud /data/app; \ ln -s /data/app /var/www/nextcloud; \ @@ -31,7 +32,7 @@ rm -f /var/log/alternatives.log /var/log/apt/*; \ # specific cleanup apt-get purge -y wget ca-certificates; \ -rm /usr/local/etc/nc-nextcloud.sh; \ +rm /nc-nextcloud.sh; \ sed -i -E "s/^requirepass .*/requirepass default/" /etc/redis/redis.conf; \ echo -e "[client]\npassword=default" > /root/.my.cnf; \ chmod 600 /root/.my.cnf |