Merge branch 'master' of github.com:invoiceninja/dockerfiles

This commit is contained in:
Sam
2016-05-11 11:01:09 +03:00
2 changed files with 5 additions and 4 deletions

View File

@@ -33,6 +33,7 @@ RUN curl -o invoiceninja.tar.gz -SL https://github.com/hillelcoren/invoice-ninja
&& mv /var/www/invoiceninja-${INVOICENINJA_VERSION} /var/www/app \
&& chown -R www-data:www-data /var/www/app \
&& composer install --working-dir /var/www/app -o --no-dev --no-interaction --prefer-source\
&& chown -R www-data:www-data /var/www/app/bootstrap/cache \
&& mv /var/www/app/storage /var/www/app/docker-backup-storage \
&& mv /var/www/app/public/logo /var/www/app/docker-backup-public-logo

View File

@@ -13,23 +13,23 @@ echo "DB_USERNAME=$DB_USERNAME" >> .env
echo "DB_PASSWORD=$DB_PASSWORD" >> .env
if [ ! -d /var/www/app/storage ]; then
mv /var/www/app/docker-backup-storage /var/www/app/storage
cp -Rp /var/www/app/docker-backup-storage /var/www/app/storage
else
IN_STORAGE_BACKUP="$(ls /var/www/app/docker-backup-storage/)"
for path in $IN_STORAGE_BACKUP; do
if [ ! -e "/var/www/app/storage/$path" ]; then
mv "/var/www/app/docker-backup-storage/$path" "/var/www/app/storage/"
cp -Rp "/var/www/app/docker-backup-storage/$path" "/var/www/app/storage/"
fi
done
fi
if [ ! -d /var/www/app/public/logo ]; then
mv /var/www/app/docker-backup-public-logo /var/www/app/public/logo
cp -Rp /var/www/app/docker-backup-public-logo /var/www/app/public/logo
else
IN_LOGO_BACKUP="$(ls /var/www/app/docker-backup-public-logo/)"
for path in $IN_LOGO_BACKUP; do
if [ ! -e "/var/www/app/public/logo/$path" ]; then
mv "/var/www/app/docker-backup-public-logo/$path" "/var/www/app/public/logo/"
cp -Rp "/var/www/app/docker-backup-public-logo/$path" "/var/www/app/public/logo/"
fi
done
fi