build(docker): amélioration de la gestion du proxy et suppression dépôt sury (refs #41)

Author: mborne

.docker/Dockerfile

@@ -3,18 +3,6 @@ FROM php:8.1-apache
 #ENV COMPOSER_ALLOW_SUPERUSER=1
 RUN rm /etc/apt/preferences.d/no-debian-php
 
-ARG http_proxy=""
-ENV http_proxy=${http_proxy}
-ENV HTTP_PROXY=${http_proxy}
-
-ARG https_proxy=""
-ENV https_proxy=${https_proxy}
-ENV HTTPS_PROXY=${https_proxy}
-
-ARG no_proxy=""
-ENV no_proxy=${no_proxy}
-ENV NO_PROXY=${no_proxy}
-
 #----------------------------------------------------------------------
 # Env vars for validator-api
 #----------------------------------------------------------------------
@@ -121,6 +109,7 @@ RUN composer install
 RUN mkdir -p /opt/validator-api/var/data/validations
 VOLUME /opt/validator-api/var/data
 
+
 #----------------------------------------------------------------------
 # Replace default command
 #----------------------------------------------------------------------

.env

@@ -25,10 +25,6 @@ DATA_DIR=%kernel.project_dir%/var/data
 HOST_HOSTNAME=localhost
 POSTGRES_USER=validator
 POSTGRES_PASSWORD=validator
-http_proxy=
-https_proxy=
-HTTP_PROXY=
-HTTPS_PROXY=
 
 ###> symfony/framework-bundle ###
 APP_ENV=dev

docker-compose.yml

@@ -11,9 +11,9 @@ services:
       args:
         - http_proxy
         - https_proxy
-        - HTTP_PROXY
-        - HTTPS_PROXY
     environment:
+      - HTTP_PROXY=${HTTP_PROXY}
+      - HTTPS_PROXY=${HTTPS_PROXY}
       - APP_ENV=${APP_ENV}
       - POSTGRES_USER=${POSTGRES_USER}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
@@ -52,6 +52,8 @@ services:
     image: ignf/validator-api:latest
     command: .docker/application.sh backend
     environment:
+      - HTTP_PROXY=${HTTP_PROXY}
+      - HTTPS_PROXY=${HTTPS_PROXY}
       - APP_ENV=${APP_ENV}
       - POSTGRES_USER=${POSTGRES_USER}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
@@ -70,5 +72,6 @@ networks:
 volumes:
   # validations files
   api-data:
-  # postgresql files
+  # postgresql files (docker volume create db-data)
   db-data:
+