Skip to content

Commit

Permalink
docker build fails if called script fails
Browse files Browse the repository at this point in the history
[#131001637]

Signed-off-by: Tyler Schultz <[email protected]>
  • Loading branch information
DennisDenuto authored and Bosh Robinson committed Oct 5, 2016
1 parent 424b51e commit bcd3fc9
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions ci/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ENV LANG en_US.UTF-8
ENV LC_ALL en_US.UTF-8

RUN apt-get update
RUN apt-get -y upgrade; apt-get clean
RUN apt-get -y upgrade && apt-get clean

RUN apt-get install -y build-essential zlib1g-dev libssl-dev libxml2-dev libsqlite3-dev libxslt1-dev libpq-dev libmysqlclient-dev
RUN apt-get install -y git curl wget tar
Expand All @@ -25,14 +25,14 @@ RUN cd /tmp && wget -q https://releases.hashicorp.com/vagrant/1.8.6/vagrant_1.8.
RUN vagrant plugin install vagrant-aws

# bosh-init dependencies
RUN apt-get install -y mercurial; apt-get clean
RUN apt-get install -y mercurial && apt-get clean
# ...go
ADD install-go.sh /tmp/install-go.sh
RUN chmod a+x /tmp/install-go.sh
RUN cd tmp; ./install-go.sh; rm install-go.sh
RUN cd tmp && ./install-go.sh && rm install-go.sh

# lifecycle ssh test
RUN apt-get install -y sshpass; apt-get clean
RUN apt-get install -y sshpass && apt-get clean

# integration registry tests
RUN apt-get install -y openssh-server
Expand Down

0 comments on commit bcd3fc9

Please sign in to comment.