++ fix
This commit is contained in:
@@ -4,6 +4,7 @@ FROM php:8.3-fpm
|
||||
RUN apt-get update && apt-get install -y \
|
||||
git \
|
||||
curl \
|
||||
netcat-openbsd \
|
||||
libpng-dev \
|
||||
libjpeg62-turbo-dev \
|
||||
libfreetype6-dev \
|
||||
@@ -58,6 +59,7 @@ RUN if [ -f package-lock.json ]; then \
|
||||
COPY . .
|
||||
RUN mkdir -p bootstrap/cache storage/framework/cache storage/framework/sessions storage/framework/views storage/logs storage/app
|
||||
RUN if [ ! -f .env ] && [ -f .env.example ]; then cp .env.example .env; fi
|
||||
RUN date -u +%Y%m%d%H%M%S > .image-build-id
|
||||
RUN composer dump-autoload --optimize --no-interaction
|
||||
RUN npm run build
|
||||
|
||||
|
||||
@@ -37,12 +37,34 @@ upsert_env() {
|
||||
fi
|
||||
}
|
||||
|
||||
sync_app_code() {
|
||||
local env_backup="/tmp/termanager2.env.backup"
|
||||
|
||||
rm -f "$env_backup"
|
||||
|
||||
if [ -f /var/www/html/.env ]; then
|
||||
cp /var/www/html/.env "$env_backup"
|
||||
fi
|
||||
|
||||
cp -a /app-src/. /var/www/html/
|
||||
|
||||
if [ -f "$env_backup" ]; then
|
||||
mv "$env_backup" /var/www/html/.env
|
||||
fi
|
||||
}
|
||||
|
||||
# -----------------------------------------------
|
||||
# 0. Sync application code from image to volume
|
||||
# -----------------------------------------------
|
||||
IMAGE_BUILD_FILE="/app-src/.image-build-id"
|
||||
VOLUME_BUILD_FILE="/var/www/html/.image-build-id"
|
||||
|
||||
if [ ! -f /var/www/html/artisan ]; then
|
||||
echo "[*] Syncing application code to volume..."
|
||||
cp -a /app-src/. /var/www/html/
|
||||
sync_app_code
|
||||
elif [ -f "$IMAGE_BUILD_FILE" ] && { [ ! -f "$VOLUME_BUILD_FILE" ] || ! cmp -s "$IMAGE_BUILD_FILE" "$VOLUME_BUILD_FILE"; }; then
|
||||
echo "[*] New image detected. Syncing updated application code to volume..."
|
||||
sync_app_code
|
||||
else
|
||||
echo "[✓] Application code already in volume."
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user