split app folder

This commit is contained in:
Tilo Spannagel 2017-04-17 23:02:25 +02:00
parent ae5b15cca3
commit fc384e6a7e
No known key found for this signature in database
GPG Key ID: B89F1626A58E1429
23 changed files with 130 additions and 42 deletions

View File

@ -56,6 +56,7 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \
&& rm nextcloud.tar.bz2 && rm nextcloud.tar.bz2
COPY docker-entrypoint.sh /entrypoint.sh COPY docker-entrypoint.sh /entrypoint.sh
COPY apps.config.php /usr/src/nextcloud/config/apps.config.php
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["apache2-foreground"] CMD ["apache2-foreground"]

View File

@ -0,0 +1,15 @@
<?php
$CONFIG = array (
"apps_paths" => array (
0 => array (
"path" => OC::$SERVERROOT."/apps",
"url" => "/apps",
"writable" => false,
),
1 => array (
"path" => OC::$SERVERROOT."/custom_apps",
"url" => "/custom_apps",
"writable" => true,
),
),
);

View File

@ -22,17 +22,13 @@ if version_greater "$image_version" "$installed_version"; then
su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
fi fi
rsync -a --delete --exclude /config/ --exclude /data/ --exclude /apps/ /usr/src/nextcloud/ /var/www/html/ rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ /usr/src/nextcloud/ /var/www/html/
if [ ! -d /var/www/html/config ]; then if [ ! -d /var/www/html/config ]; then
cp -arT /usr/src/nextcloud/config /var/www/html/config cp -arT /usr/src/nextcloud/config /var/www/html/config
fi fi
mkdir -p /var/www/html/apps mkdir -p /var/www/html/custom_apps
for app in `find /usr/src/nextcloud/apps -maxdepth 1 -mindepth 1 -type d | cut -d / -f 6`; do
rm -rf /var/www/html/apps/$app
cp -arT /usr/src/nextcloud/apps/$app /var/www/html/apps/$app
done
chown -R www-data /var/www/html chown -R www-data /var/www/html

View File

@ -54,6 +54,7 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \
&& rm nextcloud.tar.bz2 && rm nextcloud.tar.bz2
COPY docker-entrypoint.sh /entrypoint.sh COPY docker-entrypoint.sh /entrypoint.sh
COPY apps.config.php /usr/src/nextcloud/config/apps.config.php
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["php-fpm"] CMD ["php-fpm"]

15
10.0/fpm/apps.config.php Normal file
View File

@ -0,0 +1,15 @@
<?php
$CONFIG = array (
"apps_paths" => array (
0 => array (
"path" => OC::$SERVERROOT."/apps",
"url" => "/apps",
"writable" => false,
),
1 => array (
"path" => OC::$SERVERROOT."/custom_apps",
"url" => "/custom_apps",
"writable" => true,
),
),
);

View File

@ -22,17 +22,13 @@ if version_greater "$image_version" "$installed_version"; then
su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
fi fi
rsync -a --delete --exclude /config/ --exclude /data/ --exclude /apps/ /usr/src/nextcloud/ /var/www/html/ rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ /usr/src/nextcloud/ /var/www/html/
if [ ! -d /var/www/html/config ]; then if [ ! -d /var/www/html/config ]; then
cp -arT /usr/src/nextcloud/config /var/www/html/config cp -arT /usr/src/nextcloud/config /var/www/html/config
fi fi
mkdir -p /var/www/html/apps mkdir -p /var/www/html/custom_apps
for app in `find /usr/src/nextcloud/apps -maxdepth 1 -mindepth 1 -type d | cut -d / -f 6`; do
rm -rf /var/www/html/apps/$app
cp -arT /usr/src/nextcloud/apps/$app /var/www/html/apps/$app
done
chown -R www-data /var/www/html chown -R www-data /var/www/html

View File

@ -56,6 +56,7 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \
&& rm nextcloud.tar.bz2 && rm nextcloud.tar.bz2
COPY docker-entrypoint.sh /entrypoint.sh COPY docker-entrypoint.sh /entrypoint.sh
COPY apps.config.php /usr/src/nextcloud/config/apps.config.php
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["apache2-foreground"] CMD ["apache2-foreground"]

View File

@ -0,0 +1,15 @@
<?php
$CONFIG = array (
"apps_paths" => array (
0 => array (
"path" => OC::$SERVERROOT."/apps",
"url" => "/apps",
"writable" => false,
),
1 => array (
"path" => OC::$SERVERROOT."/custom_apps",
"url" => "/custom_apps",
"writable" => true,
),
),
);

View File

@ -22,17 +22,13 @@ if version_greater "$image_version" "$installed_version"; then
su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
fi fi
rsync -a --delete --exclude /config/ --exclude /data/ --exclude /apps/ /usr/src/nextcloud/ /var/www/html/ rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ /usr/src/nextcloud/ /var/www/html/
if [ ! -d /var/www/html/config ]; then if [ ! -d /var/www/html/config ]; then
cp -arT /usr/src/nextcloud/config /var/www/html/config cp -arT /usr/src/nextcloud/config /var/www/html/config
fi fi
mkdir -p /var/www/html/apps mkdir -p /var/www/html/custom_apps
for app in `find /usr/src/nextcloud/apps -maxdepth 1 -mindepth 1 -type d | cut -d / -f 6`; do
rm -rf /var/www/html/apps/$app
cp -arT /usr/src/nextcloud/apps/$app /var/www/html/apps/$app
done
chown -R www-data /var/www/html chown -R www-data /var/www/html

View File

@ -54,6 +54,7 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \
&& rm nextcloud.tar.bz2 && rm nextcloud.tar.bz2
COPY docker-entrypoint.sh /entrypoint.sh COPY docker-entrypoint.sh /entrypoint.sh
COPY apps.config.php /usr/src/nextcloud/config/apps.config.php
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["php-fpm"] CMD ["php-fpm"]

15
11.0/fpm/apps.config.php Normal file
View File

@ -0,0 +1,15 @@
<?php
$CONFIG = array (
"apps_paths" => array (
0 => array (
"path" => OC::$SERVERROOT."/apps",
"url" => "/apps",
"writable" => false,
),
1 => array (
"path" => OC::$SERVERROOT."/custom_apps",
"url" => "/custom_apps",
"writable" => true,
),
),
);

View File

@ -22,17 +22,13 @@ if version_greater "$image_version" "$installed_version"; then
su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
fi fi
rsync -a --delete --exclude /config/ --exclude /data/ --exclude /apps/ /usr/src/nextcloud/ /var/www/html/ rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ /usr/src/nextcloud/ /var/www/html/
if [ ! -d /var/www/html/config ]; then if [ ! -d /var/www/html/config ]; then
cp -arT /usr/src/nextcloud/config /var/www/html/config cp -arT /usr/src/nextcloud/config /var/www/html/config
fi fi
mkdir -p /var/www/html/apps mkdir -p /var/www/html/custom_apps
for app in `find /usr/src/nextcloud/apps -maxdepth 1 -mindepth 1 -type d | cut -d / -f 6`; do
rm -rf /var/www/html/apps/$app
cp -arT /usr/src/nextcloud/apps/$app /var/www/html/apps/$app
done
chown -R www-data /var/www/html chown -R www-data /var/www/html

View File

@ -56,6 +56,7 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \
&& rm nextcloud.tar.bz2 && rm nextcloud.tar.bz2
COPY docker-entrypoint.sh /entrypoint.sh COPY docker-entrypoint.sh /entrypoint.sh
COPY apps.config.php /usr/src/nextcloud/config/apps.config.php
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["apache2-foreground"] CMD ["apache2-foreground"]

View File

@ -0,0 +1,15 @@
<?php
$CONFIG = array (
"apps_paths" => array (
0 => array (
"path" => OC::$SERVERROOT."/apps",
"url" => "/apps",
"writable" => false,
),
1 => array (
"path" => OC::$SERVERROOT."/custom_apps",
"url" => "/custom_apps",
"writable" => true,
),
),
);

View File

@ -22,17 +22,13 @@ if version_greater "$image_version" "$installed_version"; then
su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
fi fi
rsync -a --delete --exclude /config/ --exclude /data/ --exclude /apps/ /usr/src/nextcloud/ /var/www/html/ rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ /usr/src/nextcloud/ /var/www/html/
if [ ! -d /var/www/html/config ]; then if [ ! -d /var/www/html/config ]; then
cp -arT /usr/src/nextcloud/config /var/www/html/config cp -arT /usr/src/nextcloud/config /var/www/html/config
fi fi
mkdir -p /var/www/html/apps mkdir -p /var/www/html/custom_apps
for app in `find /usr/src/nextcloud/apps -maxdepth 1 -mindepth 1 -type d | cut -d / -f 6`; do
rm -rf /var/www/html/apps/$app
cp -arT /usr/src/nextcloud/apps/$app /var/www/html/apps/$app
done
chown -R www-data /var/www/html chown -R www-data /var/www/html

View File

@ -54,6 +54,7 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \
&& rm nextcloud.tar.bz2 && rm nextcloud.tar.bz2
COPY docker-entrypoint.sh /entrypoint.sh COPY docker-entrypoint.sh /entrypoint.sh
COPY apps.config.php /usr/src/nextcloud/config/apps.config.php
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["php-fpm"] CMD ["php-fpm"]

15
9.0/fpm/apps.config.php Normal file
View File

@ -0,0 +1,15 @@
<?php
$CONFIG = array (
"apps_paths" => array (
0 => array (
"path" => OC::$SERVERROOT."/apps",
"url" => "/apps",
"writable" => false,
),
1 => array (
"path" => OC::$SERVERROOT."/custom_apps",
"url" => "/custom_apps",
"writable" => true,
),
),
);

View File

@ -22,17 +22,13 @@ if version_greater "$image_version" "$installed_version"; then
su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
fi fi
rsync -a --delete --exclude /config/ --exclude /data/ --exclude /apps/ /usr/src/nextcloud/ /var/www/html/ rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ /usr/src/nextcloud/ /var/www/html/
if [ ! -d /var/www/html/config ]; then if [ ! -d /var/www/html/config ]; then
cp -arT /usr/src/nextcloud/config /var/www/html/config cp -arT /usr/src/nextcloud/config /var/www/html/config
fi fi
mkdir -p /var/www/html/apps mkdir -p /var/www/html/custom_apps
for app in `find /usr/src/nextcloud/apps -maxdepth 1 -mindepth 1 -type d | cut -d / -f 6`; do
rm -rf /var/www/html/apps/$app
cp -arT /usr/src/nextcloud/apps/$app /var/www/html/apps/$app
done
chown -R www-data /var/www/html chown -R www-data /var/www/html

View File

@ -56,6 +56,7 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \
&& rm nextcloud.tar.bz2 && rm nextcloud.tar.bz2
COPY docker-entrypoint.sh /entrypoint.sh COPY docker-entrypoint.sh /entrypoint.sh
COPY apps.config.php /usr/src/nextcloud/config/apps.config.php
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["%%CMD%%"] CMD ["%%CMD%%"]

View File

@ -56,6 +56,7 @@ RUN curl -fsSL -o nextcloud.tar.bz2 \
&& rm nextcloud.tar.bz2 && rm nextcloud.tar.bz2
COPY docker-entrypoint.sh /entrypoint.sh COPY docker-entrypoint.sh /entrypoint.sh
COPY apps.config.php /usr/src/nextcloud/config/apps.config.php
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["%%CMD%%"] CMD ["%%CMD%%"]

15
apps.config.php Normal file
View File

@ -0,0 +1,15 @@
<?php
$CONFIG = array (
"apps_paths" => array (
0 => array (
"path" => OC::$SERVERROOT."/apps",
"url" => "/apps",
"writable" => false,
),
1 => array (
"path" => OC::$SERVERROOT."/custom_apps",
"url" => "/custom_apps",
"writable" => true,
),
),
);

View File

@ -22,17 +22,13 @@ if version_greater "$image_version" "$installed_version"; then
su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
fi fi
rsync -a --delete --exclude /config/ --exclude /data/ --exclude /apps/ /usr/src/nextcloud/ /var/www/html/ rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ /usr/src/nextcloud/ /var/www/html/
if [ ! -d /var/www/html/config ]; then if [ ! -d /var/www/html/config ]; then
cp -arT /usr/src/nextcloud/config /var/www/html/config cp -arT /usr/src/nextcloud/config /var/www/html/config
fi fi
mkdir -p /var/www/html/apps mkdir -p /var/www/html/custom_apps
for app in `find /usr/src/nextcloud/apps -maxdepth 1 -mindepth 1 -type d | cut -d / -f 6`; do
rm -rf /var/www/html/apps/$app
cp -arT /usr/src/nextcloud/apps/$app /var/www/html/apps/$app
done
chown -R www-data /var/www/html chown -R www-data /var/www/html

View File

@ -46,6 +46,9 @@ for latest in "${latests[@]}"; do
# Copy the docker-entrypoint. # Copy the docker-entrypoint.
cp docker-entrypoint.sh "$version/$variant/docker-entrypoint.sh" cp docker-entrypoint.sh "$version/$variant/docker-entrypoint.sh"
# Copy apps.config.php
cp apps.config.php "$version/$variant/apps.config.php"
travisEnv='\n - VERSION='"$version"' VARIANT='"$variant$travisEnv" travisEnv='\n - VERSION='"$version"' VARIANT='"$variant$travisEnv"
done done
done done