diff --git a/resources/docker/dockerfiles/release-base.Dockerfile b/resources/docker/dockerfiles/release-base.Dockerfile index 3eadc939..c522b3ba 100644 --- a/resources/docker/dockerfiles/release-base.Dockerfile +++ b/resources/docker/dockerfiles/release-base.Dockerfile @@ -3,6 +3,6 @@ FROM php:8.3-fpm-alpine # Install package and PHP dependencies 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; \ + docker-php-ext-install bcmath pdo_mysql pdo_pgsql zip ftp; \ mkdir /ssl-certs; \ docker-php-source delete diff --git a/resources/docker/dockerfiles/release-multiplatform.Dockerfile b/resources/docker/dockerfiles/release-multiplatform.Dockerfile index 2731a8b3..496a7def 100644 --- a/resources/docker/dockerfiles/release-multiplatform.Dockerfile +++ b/resources/docker/dockerfiles/release-multiplatform.Dockerfile @@ -2,9 +2,11 @@ # ================================ # PHP Dependency Setup -FROM composer AS builder +FROM linkace/base-image:php-8.3-alpine AS builder WORKDIR /app +COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer + # Make needed parts of the app available in the container COPY ./app /app/app COPY ./bootstrap /app/bootstrap @@ -28,7 +30,9 @@ RUN mv vendor/spatie/laravel-backup/resources/lang/de vendor/spatie/laravel-back 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 + mv vendor/spatie/laravel-backup/resources/lang/ro vendor/spatie/laravel-backup/resources/lang/zh_CN; \ + mv vendor/spatie/laravel-backup/resources/lang/ru vendor/spatie/laravel-backup/resources/lang/ro_RO; \ + mv vendor/spatie/laravel-backup/resources/lang/zh-CN vendor/spatie/laravel-backup/resources/lang/ru_RU # ================================ # Compile all assets