Merge remote-tracking branch 'origin/main'

This commit is contained in:
2026-04-29 19:43:58 +02:00
2 changed files with 22 additions and 2 deletions

View File

@@ -10,7 +10,8 @@ RUN addgroup -g ${GID} -S ${GROUPNAME} \
RUN apk add --no-cache \ RUN apk add --no-cache \
mc \ mc \
unzip unzip \
rsync
COPY --chmod=0755 /docker/php/composer.phar /usr/bin/composer COPY --chmod=0755 /docker/php/composer.phar /usr/bin/composer
RUN apk add --no-cache --virtual .build-deps \ RUN apk add --no-cache --virtual .build-deps \
@@ -33,4 +34,6 @@ RUN npm run build
EXPOSE 9000 EXPOSE 9000
CMD ["php-fpm"] RUN mv /var/www/html /src
COPY docker/run-mareike.sh /usr/local/bin/
CMD ["run-mareike.sh"]

17
docker/run-mareike.sh Executable file
View File

@@ -0,0 +1,17 @@
#!/bin/sh
set -e
rsync -rlDog --chown $USER:$GROUPNAME --delete --exclude=/storage /src/ /var/www/html
install -d -m 0755 -o $USER -g $GROUPNAME \
storage \
storage/framework \
storage/framework/cache \
storage/framework/sessions \
storage/framework/views \
storage/app \
storage/app/private \
storage/logs
php artisan migrate --force
exec "php-fpm"