From b6963d0e5cdaed673345ac9c1ab196741cb23eb4 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 22 Jan 2020 17:44:18 +0000 Subject: [PATCH] Use bash in Docker scripts Our Docker scripts use Bash-style conditionals that aren't supported by the default Debian shell. --- Dockerfile | 4 ++-- scripts/docker-link-repos.sh | 2 +- scripts/docker-write-version.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8d83af0a..8f584b81 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ RUN apt-get update && apt-get install -y git dos2unix WORKDIR /src COPY . /src -RUN dos2unix /src/scripts/docker-link-repos.sh && sh /src/scripts/docker-link-repos.sh +RUN dos2unix /src/scripts/docker-link-repos.sh && bash /src/scripts/docker-link-repos.sh RUN yarn --network-timeout=100000 install RUN yarn build @@ -22,7 +22,7 @@ RUN yarn build RUN cp /src/config.sample.json /src/webapp/config.json # Ensure we populate the version file -RUN dos2unix /src/scripts/docker-write-version.sh && sh /src/scripts/docker-write-version.sh +RUN dos2unix /src/scripts/docker-write-version.sh && bash /src/scripts/docker-write-version.sh # App diff --git a/scripts/docker-link-repos.sh b/scripts/docker-link-repos.sh index 66bd9842..b35ce89c 100644 --- a/scripts/docker-link-repos.sh +++ b/scripts/docker-link-repos.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -ex diff --git a/scripts/docker-write-version.sh b/scripts/docker-write-version.sh index 730f47af..774bb49c 100644 --- a/scripts/docker-write-version.sh +++ b/scripts/docker-write-version.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -ex