From 90c5f6f2a8e5945f98c1adf476c309f8bb7d00a8 Mon Sep 17 00:00:00 2001 From: Kovah Date: Mon, 20 Mar 2023 15:26:36 +0100 Subject: [PATCH] Fix the release images (#627) --- .../docker/dockerfiles/release-base.Dockerfile | 5 +++-- .../release-multiplatform.Dockerfile | 17 +++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/resources/docker/dockerfiles/release-base.Dockerfile b/resources/docker/dockerfiles/release-base.Dockerfile index aa8689c7..08d79e13 100644 --- a/resources/docker/dockerfiles/release-base.Dockerfile +++ b/resources/docker/dockerfiles/release-base.Dockerfile @@ -1,7 +1,8 @@ FROM php:8.2-fpm-alpine # Install package and PHP dependencies -RUN apk add --no-cache mariadb-client postgresql postgresql-dev sqlite3 zip libzip-dev; \ +RUN apk add --no-cache mariadb-client postgresql postgresql-dev sqlite zip libzip-dev; \ docker-php-ext-configure zip; \ docker-php-ext-install bcmath pdo_mysql pdo_pgsql zip; \ - mkdir /ssl-certs + mkdir /ssl-certs; \ + docker-php-source delete diff --git a/resources/docker/dockerfiles/release-multiplatform.Dockerfile b/resources/docker/dockerfiles/release-multiplatform.Dockerfile index 87d0cc6c..76891dfa 100644 --- a/resources/docker/dockerfiles/release-multiplatform.Dockerfile +++ b/resources/docker/dockerfiles/release-multiplatform.Dockerfile @@ -21,6 +21,15 @@ COPY ./.env.example /app/.env # Install dependencies using Composer RUN composer install -n --prefer-dist --no-dev +RUN mv vendor/spatie/laravel-backup/resources/lang/de vendor/spatie/laravel-backup/resources/lang/de_DE; \ + mv vendor/spatie/laravel-backup/resources/lang/en vendor/spatie/laravel-backup/resources/lang/en_US; \ + mv vendor/spatie/laravel-backup/resources/lang/es vendor/spatie/laravel-backup/resources/lang/es_ES; \ + mv vendor/spatie/laravel-backup/resources/lang/fr vendor/spatie/laravel-backup/resources/lang/fr_FR; \ + mv vendor/spatie/laravel-backup/resources/lang/it vendor/spatie/laravel-backup/resources/lang/it_IT; \ + mv vendor/spatie/laravel-backup/resources/lang/no vendor/spatie/laravel-backup/resources/lang/no_NO; \ + mv vendor/spatie/laravel-backup/resources/lang/pl vendor/spatie/laravel-backup/resources/lang/pl_PL; \ + mv vendor/spatie/laravel-backup/resources/lang/zh-CN vendor/spatie/laravel-backup/resources/lang/zh_CN + # ================================ # Compile all assets FROM node:18 AS npm_builder @@ -61,14 +70,6 @@ COPY --from=builder /app/bootstrap/cache /app/bootstrap/cache # Publish package resources RUN php artisan vendor:publish --provider="Spatie\Backup\BackupServiceProvider" -RUN mv vendor/spatie/laravel-backup/resources/lang/de vendor/spatie/laravel-backup/resources/lang/de_DE; \ - mv vendor/spatie/laravel-backup/resources/lang/en vendor/spatie/laravel-backup/resources/lang/en_US; \ - mv vendor/spatie/laravel-backup/resources/lang/es vendor/spatie/laravel-backup/resources/lang/es_ES; \ - mv vendor/spatie/laravel-backup/resources/lang/fr vendor/spatie/laravel-backup/resources/lang/fr_FR; \ - mv vendor/spatie/laravel-backup/resources/lang/it vendor/spatie/laravel-backup/resources/lang/it_IT; \ - mv vendor/spatie/laravel-backup/resources/lang/no vendor/spatie/laravel-backup/resources/lang/no_NO; \ - mv vendor/spatie/laravel-backup/resources/lang/pl vendor/spatie/laravel-backup/resources/lang/pl_PL; \ - mv vendor/spatie/laravel-backup/resources/lang/zh-CN vendor/spatie/laravel-backup/resources/lang/zh_CN # Copy files from the theme build COPY --from=npm_builder /srv/public/assets/dist/js /app/public/assets/dist/js