Skip to content
This repository was archived by the owner on May 23, 2021. It is now read-only.

Commit 87b229a

Browse files
committed
Fix Docker build script with multiple arguments
Also change the install order in the Centos dockerfile since some of that needs to install after the enable command.
1 parent add03ea commit 87b229a

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

scripts/centos.dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
FROM centos:7
22

3-
RUN yum install -y centos-release-scl devtoolset-6 gcc-c++ git
3+
RUN yum install -y centos-release-scl
44
RUN yum-config-manager --enable rhel-server-rhscl-7-rpms
5+
RUN yum install -y devtoolset-6
6+
RUN yum install -y gcc-c++
7+
RUN yum install -y git
58
RUN rpm -Uvh http://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.3.4-1.el7.x86_64.rpm
69

710
RUN mkdir /root/node

scripts/docker.bash

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@ function main() {
3333

3434
# If there are command line arguments, use those. Otherwise loop through all
3535
# the existing dockerfiles.
36-
if [[ -n "${1:-}" ]] ; then
37-
local name="$1" ; shift
38-
build "$name"
36+
if [[ -n ${1:-} ]] ; then
37+
while [[ -n ${1:-} ]] ; do
38+
build "$1" ; shift
39+
done
3940
else
4041
for dockerfile in *.dockerfile ; do
4142
local name="${dockerfile%.dockerfile}"

0 commit comments

Comments
 (0)