fix docker setup

shopwareArchive · Dec 4, 2018 · 2295229 · 2295229
1 parent e46042d
commit 2295229
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.psh.yaml.dist b/.psh.yaml.dist
@@ -16,8 +16,9 @@ dynamic:
   MYSQL_ID: docker-compose ps -q app_mysql
   ES_ID: docker-compose ps -q app_es
   REDIS_ID: docker-compose ps -q app_redis
+  DOCKER_HTTP_PROXY: echo $HTTP_PROXY
 
 environments:
   docker:
     paths:
-      - "dev-ops/docker/actions"
+      - "dev-ops/docker/actions"
diff --git a/dev-ops/docker/containers/php7/Dockerfile b/dev-ops/docker/containers/php7/Dockerfile
@@ -1,7 +1,5 @@
 FROM php:7.1-apache
 
-ENV DOCKER_HTTP_PROXY $HTTP_PROXY
-
 RUN apt-get update -qq && apt-get install -y -qq apt-utils && mkdir -p /usr/share/man/man1 \
     && apt-get update -qq && apt-get install -y -qq openjdk-8-jre-headless \
     && apt-get update -qq && apt-get install -y -qq  openjdk-8-jdk && dpkg --configure -a
@@ -43,7 +41,7 @@ RUN docker-php-ext-install iconv mcrypt mbstring opcache \
     && docker-php-ext-install pdo \
     && docker-php-ext-install pdo_mysql
 
-RUN pear config-set http_proxy $DOCKER_HTTP_PROXY
+RUN pear config-set http_proxy __DOCKER_HTTP_PROXY__
 
 RUN pecl install apcu
 RUN echo "extension=apcu.so" > /usr/local/etc/php/conf.d/apcu.ini