Merge pull request #77 from EmakinaFR/feature/composer

EmakinaFR · Dec 24, 2021 · 93d0bea · 93d0bea
2 parents 23c741e + 4050415
commit 93d0bea
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 38 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -35,7 +35,7 @@ services:
     depends_on:
       - php
     ports:
-      - 1080:80
+      - "1080:80"
 
   mysql:
     image: mariadb:latest
@@ -73,8 +73,6 @@ services:
       - code_sync:/var/www/html:nocopy
       # Custom configuration
       - ./php/conf.d/custom.ini:/usr/local/etc/php/conf.d/custom.ini:ro
-      # Proximis composer proxy JSON
-      - ${PROJECT_LOCATION}/docker/local/composer-proxy.json:/usr/local/bin/composer-proxy.json:ro
       # SSH keys
       - ~/.ssh:/root/.ssh:ro
     depends_on:

diff --git a/php/entrypoint.sh b/php/entrypoint.sh
@@ -1,12 +1,6 @@
 #!/usr/bin/env sh
 set -euo pipefail
 
-# Run the composer proxy in background
-COMPOSER_JSON=/usr/local/bin/composer-proxy.json
-if [ -f "${COMPOSER_JSON}" ]; then
-  nohup /usr/local/bin/composer-proxy -c ${COMPOSER_JSON}
-fi
-
 # Ensure that the document root is writable by the "www-data" user
 chown www-data:www-data /var/www/html