docker/Dockerfile in minke-1.14.5 vs docker/Dockerfile in minke-1.15.0

- old
+ new

@@ -1,8 +1,9 @@ FROM ruby:2.3.1 ENV COMPOSE_VERSION 1.11.1 +ENV TERRAFORM_VERSION 0.9.2 ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin # Build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF @@ -14,11 +15,11 @@ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/nicholasjackson/minke" RUN apt-get update -RUN apt-get -y install procps build-essential openssl libreadline6 libreadline6-dev curl git-core zlib1g zlib1g-dev libssl-dev libyaml-dev libxml2-dev libxslt-dev autoconf libc6-dev ncurses-dev automake libtool bison rubygems ca-certificates apt-transport-https +RUN apt-get -y install procps build-essential openssl libreadline6 libreadline6-dev curl git-core zlib1g zlib1g-dev libssl-dev libyaml-dev libxml2-dev libxslt-dev autoconf libc6-dev ncurses-dev automake libtool bison rubygems ca-certificates apt-transport-https unzip RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D RUN echo "deb https://apt.dockerproject.org/repo debian-jessie main" > /etc/apt/sources.list.d/docker.list @@ -26,9 +27,14 @@ RUN apt-get -y install docker-engine=1.10.3-0~jessie RUN curl -o /usr/local/bin/docker-compose -L \ "https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-Linux-x86_64" \ && chmod +x /usr/local/bin/docker-compose + +RUN curl -o ./terraform.zip \ + "https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip" \ + && unzip ./terraform.zip \ + && mv ./terraform /usr/local/bin/terraform COPY Gemfile Gemfile COPY entrypoint.sh / RUN chmod +x /entrypoint.sh