Skip to content

Commit

Permalink
switched to oficial terraform hetzner provider and docker-ce edge (18…
Browse files Browse the repository at this point in the history
….05)
  • Loading branch information
insekticid committed Jun 20, 2018
1 parent 8a30542 commit 4c103c9
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
16 changes: 8 additions & 8 deletions hetzner/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ ENTRYPOINT ["/bin/terraform"]

CMD ["--help"]

ENV HCLOUD_VERSION=1.1.0
ENV HCLOUD_VERSION=1.2.0
ENV HCLOUD_FILENAME=terraform-provider-hcloud_v${HCLOUD_VERSION}_linux_amd64.zip
ENV HCLOUD_TERRAFORM_URL=https://github.com/hetznercloud/terraform-provider-hcloud/releases/download/v${HCLOUD_VERSION}/${HCLOUD_FILENAME}
ENV HCLOUD_TERRAFORM_URL=https://github.com/terraform-providers/terraform-provider-hcloud/releases/download/v${HCLOUD_VERSION}/${HCLOUD_FILENAME}
ENV HCLOUD_TERRAFORM_SHA256SUM=

RUN echo "Install Terraform plugin from:" \
&& echo "${HCLOUD_TERRAFORM_URL}"
RUN mkdir -p ~/.terraform.d/plugins/
RUN wget -q ${HCLOUD_TERRAFORM_URL}
RUN unzip ${HCLOUD_FILENAME} -d ~/.terraform.d/plugins/
RUN rm -f ${HCLOUD_FILENAME}
#RUN echo "Install Terraform plugin from:" \
# && echo "${HCLOUD_TERRAFORM_URL}"
#RUN mkdir -p ~/.terraform.d/plugins/
#RUN wget -q ${HCLOUD_TERRAFORM_URL}
#RUN unzip ${HCLOUD_FILENAME} -d ~/.terraform.d/plugins/
#RUN rm -f ${HCLOUD_FILENAME}

RUN rm -rf /tmp/* && \
rm -rf /var/cache/apk/* && \
Expand Down
8 changes: 4 additions & 4 deletions terraform/scripts/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ apt-get -qq install -y \
ca-certificates \
curl \
jq \
software-properties-common \
docker.io
software-properties-common

curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
add-apt-repository \
"deb [arch=amd64] https://download.docker.com/linux/ubuntu \
$(lsb_release -cs) \
stable"
#apt-get -qq update && apt-get -qq install -y docker.io
edge stable"
apt-get -qq update && apt-get -qq install -y docker.ce

cat > /etc/docker/daemon.json <<EOF
{
Expand Down

0 comments on commit 4c103c9

Please sign in to comment.