fix builds

.dockerignore

@@ -3,6 +3,7 @@
 **/client/build
 **/var
 **/vendor
+**/public/bundles
 **/node_modules
 **/.idea
 **/.php-cs-fixer.php

databox/api/.dockerignore

@@ -5,3 +5,4 @@ Dockerfile
 .idea
 /.php-cs-fixer.php
 /.php-cs-fixer.cache
+/public/bundles

databox/api/Dockerfile

@@ -47,8 +47,6 @@ RUN apk add --no-cache \
         exif \
     && apk del build-essentials
 
-RUN chown -R app:app .
-
 USER app
 
 # Warm up composer cache for faster builds
@@ -57,8 +55,8 @@ RUN composer install --prefer-dist --no-dev --no-progress --classmap-authoritati
     && rm -rf vendor composer.*
 # End warm up
 
-COPY lib/php /lib/php
-COPY ./databox/api .
+COPY --chown=app:app lib/php /lib/php
+COPY --chown=app:app ./databox/api .
 
 RUN mkdir -p var/cache var/logs var/sessions \
     && composer install --prefer-dist --no-dev --no-progress --classmap-authoritative --no-interaction \

expose/api/Dockerfile

@@ -2,6 +2,8 @@ ARG BASE_TAG=latest
 ARG REGISTRY_NAMESPACE
 FROM ${REGISTRY_NAMESPACE}php-fpm-base:${BASE_TAG} AS api-php
 
+USER app
+
 # Warm up composer cache for faster builds
 COPY ./expose/api/docker/caching/composer.* ./
 RUN composer install --prefer-dist --no-dev --no-progress --classmap-authoritative --no-interaction --no-scripts \
@@ -19,6 +21,8 @@ RUN mkdir -p var/cache var/logs var/sessions \
 ARG SENTRY_RELEASE
 ENV SENTRY_RELEASE=${SENTRY_RELEASE}
 
+USER root
+
 ENTRYPOINT ["/srv/app/docker/php-entrypoint.sh"]
 
 CMD ["php-fpm"]

infra/docker/php-fpm-base/Dockerfile

@@ -75,4 +75,6 @@ RUN ln -s $PHP_INI_DIR/php.ini-production $PHP_INI_DIR/php.ini \
 
 WORKDIR /srv/app
 
+RUN chown -R app:app .
+
 CMD ["true"]

notify/api/Dockerfile

@@ -2,6 +2,8 @@ ARG BASE_TAG=latest
 ARG REGISTRY_NAMESPACE
 FROM ${REGISTRY_NAMESPACE}php-fpm-base:${BASE_TAG} AS api-php
 
+USER app
+
 # Warm up composer cache for faster builds
 COPY ./notify/api/docker/caching/composer.* ./
 RUN composer install --prefer-dist --no-dev --no-progress --classmap-authoritative --no-interaction --no-scripts \
@@ -19,6 +21,8 @@ RUN mkdir -p var/cache var/logs var/sessions \
 ARG SENTRY_RELEASE
 ENV SENTRY_RELEASE=${SENTRY_RELEASE}
 
+USER root
+
 ENTRYPOINT ["/srv/app/docker/php-entrypoint.sh"]
 
 CMD ["php-fpm"]

uploader/api/Dockerfile

@@ -2,7 +2,7 @@ ARG BASE_TAG=latest
 ARG REGISTRY_NAMESPACE
 FROM ${REGISTRY_NAMESPACE}php-fpm-base:${BASE_TAG} AS api-php
 
-RUN printf "\nrequest_terminate_timeout = 600\n" >> /usr/local/etc/php-fpm.d/large-upload.conf
+USER app
 
 # Warm up composer cache for faster builds
 COPY ./uploader/api/docker/caching/composer.* ./
@@ -21,6 +21,8 @@ RUN mkdir -p var/cache var/logs var/sessions \
 ARG SENTRY_RELEASE
 ENV SENTRY_RELEASE=${SENTRY_RELEASE}
 
+USER root
+
 ENTRYPOINT ["/srv/app/docker/php-entrypoint.sh"]
 
 CMD ["php-fpm"]