Make the build step fail when the curl operation fails. (PowerShell#6961

) Without the pipefail, the step always succeeds and the layer gets cached, resulting in confusion during the next step failing and subsequent rebuild attempt.
AML-MAR5-MDH-sudo · Jun 4, 2018 · ebc7cdf · ebc7cdf
1 parent d663b41
commit ebc7cdf
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/docker/release/centos7/Dockerfile b/docker/release/centos7/Dockerfile
@@ -35,7 +35,8 @@ RUN yum install -y \
     && yum clean all
 
 # Download and configure Microsoft Repository config file
-RUN curl https://packages.microsoft.com/config/rhel/7/prod.repo | tee /etc/yum.repos.d/microsoft.repo
+RUN set -o pipefail \
+    && curl https://packages.microsoft.com/config/rhel/7/prod.repo | tee /etc/yum.repos.d/microsoft.repo
 
 # Install latest powershell from Microsoft YUM Repo
 RUN yum install -y \

diff --git a/docker/release/fedora26/Dockerfile b/docker/release/fedora26/Dockerfile
@@ -36,7 +36,8 @@ ENV LC_ALL $LANG
 RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG
 
 # Download and configure Microsoft Repository config file
-RUN curl https://packages.microsoft.com/config/rhel/7/prod.repo | tee /etc/yum.repos.d/microsoft.repo
+RUN set -o pipefail \
+    && curl https://packages.microsoft.com/config/rhel/7/prod.repo | tee /etc/yum.repos.d/microsoft.repo
 
 # Install latest powershell from Microsoft YUM Repo
 RUN dnf install -y powershell-${POWERSHELL_VERSION} \

diff --git a/docker/release/fedora27/Dockerfile b/docker/release/fedora27/Dockerfile
@@ -37,7 +37,8 @@ ENV LC_ALL $LANG
 RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG
 
 # Download and configure Microsoft Repository config file
-RUN curl https://packages.microsoft.com/config/rhel/7/prod.repo | tee /etc/yum.repos.d/microsoft.repo
+RUN set -o pipefail \
+    && curl https://packages.microsoft.com/config/rhel/7/prod.repo | tee /etc/yum.repos.d/microsoft.repo
 
 # Install latest powershell from Microsoft YUM Repo
 RUN dnf install -y powershell-${POWERSHELL_VERSION} \

diff --git a/docker/release/ubuntu14.04/Dockerfile b/docker/release/ubuntu14.04/Dockerfile
@@ -44,7 +44,8 @@ RUN apt-get update \
 RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
 
 # Register the Microsoft Ubuntu 14.04 repository
-RUN curl https://packages.microsoft.com/config/ubuntu/14.04/prod.list | tee /etc/apt/sources.list.d/microsoft.list
+RUN set -o pipefail \
+    && curl https://packages.microsoft.com/config/ubuntu/14.04/prod.list | tee /etc/apt/sources.list.d/microsoft.list
 
 # Install powershell from Microsoft Repo
 RUN apt-get update \

diff --git a/docker/release/ubuntu16.04/Dockerfile b/docker/release/ubuntu16.04/Dockerfile
@@ -45,7 +45,8 @@ RUN locale-gen $LANG && update-locale
 RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
 
 # Register the Microsoft Ubuntu 16.04 repository
-RUN curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list | tee /etc/apt/sources.list.d/microsoft.list
+RUN set -o pipefail \
+    && curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list | tee /etc/apt/sources.list.d/microsoft.list
 
 # Install powershell from Microsoft Repo
 RUN apt-get update \