From 675481e59977241bac9c985ea3b167cb63e6e010 Mon Sep 17 00:00:00 2001 From: t0is Date: Fri, 25 Apr 2025 08:45:24 +0200 Subject: [PATCH] root --- docker-compose.yml | 12 ++++-------- docker/horizon.dockerfile | 9 ++++----- docker/php.dockerfile | 5 ++--- docker/php/Dockerfile | 7 +++---- 4 files changed, 13 insertions(+), 20 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index dc4d15a..85a20df 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,7 @@ services: restart: always ports: - '8877:80' - container_name: shipping-nginx + container_name: transcriptor-web-nginx volumes: # Please update below path as per your environment. - ./docker/nginx/default.conf:/etc/nginx/conf.d/default.conf @@ -29,11 +29,9 @@ services: - mariadb php: - container_name: shipping-php - # user: "www-data" + container_name: transcriptor-web-php # restart: always platform: linux/amd64 - user: www-data:1002 build: # Please update below path as per your environment. context: . @@ -78,9 +76,7 @@ services: - mariadb horizon: - # user: "www-data" - user: www-data:1002 - container_name: shipping-horizon + container_name: transcriptor-web-horizon platform: linux/arm64/v8 build: context: . @@ -100,7 +96,7 @@ services: # # # pdf_manager: -# container_name: shipping-pdf_manager +# container_name: transcriptor-web-pdf_manager # build: # context: . # dockerfile: ./docker/python/Dockerfile diff --git a/docker/horizon.dockerfile b/docker/horizon.dockerfile index 2d1f0c7..dd34324 100644 --- a/docker/horizon.dockerfile +++ b/docker/horizon.dockerfile @@ -7,12 +7,11 @@ RUN docker-php-ext-enable redis WORKDIR /var/www/html -COPY --chown=www-data src/. /var/www/html -COPY --chown=www-data src/.env /var/www/html/.env -COPY --chown=www-data docker/roadrunner.yaml /var/www/html/.rr.yaml -COPY --chown=www-data docker/supervisor/horizon.conf /etc/supervisor/conf.d/horizon.conf +COPY src/. /var/www/html +COPY src/.env /var/www/html/.env +COPY docker/roadrunner.yaml /var/www/html/.rr.yaml +COPY docker/supervisor/horizon.conf /etc/supervisor/conf.d/horizon.conf -USER www-data:1002 ENV COMPOSER_HOME=/tmp/composer RUN composer install --optimize-autoloader --no-dev diff --git a/docker/php.dockerfile b/docker/php.dockerfile index 9643e2e..4f13312 100644 --- a/docker/php.dockerfile +++ b/docker/php.dockerfile @@ -6,10 +6,9 @@ WORKDIR /var/www/html RUN docker-php-ext-enable redis -COPY --chown=www-data src/. /var/www/html -COPY --chown=www-data src/.env /var/www/html/.env +COPY src/. /var/www/html +COPY src/.env /var/www/html/.env -USER www-data:1002 ENV COMPOSER_HOME=/tmp/composer RUN composer install --optimize-autoloader --no-dev diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index ce90592..88a0a4d 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -11,11 +11,10 @@ RUN python3 -m venv /var/www/html/shipping_env RUN /var/www/html/shipping_env/bin/pip install --upgrade pip && \ /var/www/html/shipping_env/bin/pip install pymupdf -COPY --chown=www-data src/. /var/www/html -COPY --chown=www-data src/.env /var/www/html/.env -COPY --chown=www-data docker/roadrunner.yaml /var/www/html/.rr.yaml +COPY src/. /var/www/html +COPY src/.env /var/www/html/.env +COPY docker/roadrunner.yaml /var/www/html/.rr.yaml -USER www-data:1002 ENV COMPOSER_HOME=/tmp/composer RUN composer install --optimize-autoloader --no-dev