From 3501c4c9df7d97b0bb8a1c2baa0fffea5597aa10 Mon Sep 17 00:00:00 2001 From: Michael Stenta Date: Thu, 16 Apr 2020 20:37:49 -0400 Subject: [PATCH] Use ARG instead of ENV in Dockerfiles for variables that are only needed during build. --- docker/Dockerfile | 6 +++--- docker/dev/Dockerfile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index f4ac11a08..4100af8cb 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,9 +1,9 @@ # Inherit from the Drupal 7 image on Docker Hub. FROM drupal:7 -# Set the farmOS version in an environment variable. -#ENV FARMOS_VERSION 7.x-1.3 -ENV FARMOS_VERSION 7.x-1.x-dev +# Set the farmOS version to download. +#ARG FARMOS_VERSION=7.x-1.3 +ARG FARMOS_VERSION=7.x-1.x-dev # Enable Apache rewrite module. RUN a2enmod rewrite diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile index d76a6706d..fe2674fc3 100644 --- a/docker/dev/Dockerfile +++ b/docker/dev/Dockerfile @@ -2,7 +2,7 @@ FROM farmos/farmos:7.x-1.x # Set the farmOS version to the development branch. -ENV FARMOS_VERSION 7.x-1.x +ARG FARMOS_VERSION=7.x-1.x # Install Xdebug. RUN yes | pecl install xdebug \