aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-03-15 19:05:09 +01:00
Code Activity

Add all files in one copy instruction

Browse source 
Signed-off-by: Tilo Spannagel <development@tilosp.de>
This commit is contained in:
Tilo Spannagel 2018-10-01 14:30:49 +02:00
parent efe4edb8eb
commit 2d45a16759
No known key found for this signature in database
GPG key ID: E517E9F206B8993D
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Dockerfile-alpine.template
View file

@ -111,8 +111,7 @@ RUN set -ex; \
chmod +x /usr/src/nextcloud/occ; \ chmod +x /usr/src/nextcloud/occ; \
apk del .fetch-deps apk del .fetch-deps
COPY *.sh / COPY rootfs /
COPY config/* /usr/src/nextcloud/config/
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["%%CMD%%"] CMD ["%%CMD%%"]

3
Dockerfile-debian.template
View file

@ -126,8 +126,7 @@ RUN set -ex; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
COPY *.sh / COPY rootfs /
COPY config/* /usr/src/nextcloud/config/
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["%%CMD%%"] CMD ["%%CMD%%"]

11
update.sh
View file

@ -80,17 +80,22 @@ function create_variant() {
s/%%REDIS_VERSION%%/'"${pecl_versions[redis]}"'/g; s/%%REDIS_VERSION%%/'"${pecl_versions[redis]}"'/g;
' "$dir/Dockerfile" ' "$dir/Dockerfile"
rootfs_dir="$dir/rootfs"
mkdir -p "$rootfs_dir"
# Copy the shell scripts # Copy the shell scripts
for name in entrypoint cron; do for name in entrypoint cron; do
cp "docker-$name.sh" "$dir/$name.sh" cp "docker-$name.sh" "$rootfs_dir/$name.sh"
done done
# Copy the config directory # Copy the config directory
cp -rT .config "$dir/config" src_dir="$rootfs_dir/usr/src/nextcloud"
mkdir -p "$src_dir"
cp -rT .config "$src_dir/config"
# Remove Apache config if we're not an Apache variant. # Remove Apache config if we're not an Apache variant.
if [ "$variant" != "apache" ]; then if [ "$variant" != "apache" ]; then
rm "$dir/config/apache-pretty-urls.config.php" rm "$src_dir/config/apache-pretty-urls.config.php"
fi fi
for arch in i386 amd64; do for arch in i386 amd64; do