From 800aea518ead9b58f3cb8ef516ad7ceb64f16bb4 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Tue, 16 Aug 2016 15:54:50 -0700 Subject: [PATCH] Fix sed to modify the envvars file --- 5.6/apache/Dockerfile | 2 +- 7.0/apache/Dockerfile | 2 +- apache-Dockerfile-block-1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/5.6/apache/Dockerfile b/5.6/apache/Dockerfile index 3c1ab6ba..7290a465 100644 --- a/5.6/apache/Dockerfile +++ b/5.6/apache/Dockerfile @@ -43,7 +43,7 @@ RUN set -ex \ # : ${APACHE_RUN_USER:=www-data} # export APACHE_RUN_USER # so that they can be overridden at runtime ("-e APACHE_RUN_USER=...") - && sed -r 's/^export ([^=]+)=(.*)$/: ${\1:=\2}\nexport \1/' "$APACHE_ENVVARS" \ + && sed -ri 's/^export ([^=]+)=(.*)$/: ${\1:=\2}\nexport \1/' "$APACHE_ENVVARS" \ \ # setup directories and permissions && . "$APACHE_ENVVARS" \ diff --git a/7.0/apache/Dockerfile b/7.0/apache/Dockerfile index f78b1816..b2f7fbf0 100644 --- a/7.0/apache/Dockerfile +++ b/7.0/apache/Dockerfile @@ -43,7 +43,7 @@ RUN set -ex \ # : ${APACHE_RUN_USER:=www-data} # export APACHE_RUN_USER # so that they can be overridden at runtime ("-e APACHE_RUN_USER=...") - && sed -r 's/^export ([^=]+)=(.*)$/: ${\1:=\2}\nexport \1/' "$APACHE_ENVVARS" \ + && sed -ri 's/^export ([^=]+)=(.*)$/: ${\1:=\2}\nexport \1/' "$APACHE_ENVVARS" \ \ # setup directories and permissions && . "$APACHE_ENVVARS" \ diff --git a/apache-Dockerfile-block-1 b/apache-Dockerfile-block-1 index f0a1699c..cbfd1e44 100644 --- a/apache-Dockerfile-block-1 +++ b/apache-Dockerfile-block-1 @@ -11,7 +11,7 @@ RUN set -ex \ # : ${APACHE_RUN_USER:=www-data} # export APACHE_RUN_USER # so that they can be overridden at runtime ("-e APACHE_RUN_USER=...") - && sed -r 's/^export ([^=]+)=(.*)$/: ${\1:=\2}\nexport \1/' "$APACHE_ENVVARS" \ + && sed -ri 's/^export ([^=]+)=(.*)$/: ${\1:=\2}\nexport \1/' "$APACHE_ENVVARS" \ \ # setup directories and permissions && . "$APACHE_ENVVARS" \