Merge branch 'jessfraz:master' into master

This commit is contained in:
gnovakovic 2021-06-01 14:24:00 +02:00
commit 8f758e1821
2 changed files with 6 additions and 30 deletions

View File

@ -3,29 +3,6 @@ LABEL maintainer "Jessie Frazelle <jess@linux.com>"
RUN apk --no-cache add \
bash \
libffi \
libressl \
python3
ENV CERTBOT_VERSION 1.5.0
RUN buildDeps=' \
build-base \
git \
libffi-dev \
libressl-dev \
python3-dev \
py3-pip \
' \
set -x \
&& apk --no-cache add $buildDeps \
&& pip3 install acme \
&& git clone --depth 1 --branch "v$CERTBOT_VERSION" https://github.com/certbot/certbot /usr/src/certbot \
&& cd /usr/src/certbot/certbot \
&& python3 setup.py build || return 1 \
&& python3 setup.py install --prefix=/usr || return 1 \
&& rm -rf /usr/src/certbot \
&& apk del $buildDeps \
&& echo "Build complete."
certbot
ENTRYPOINT [ "certbot" ]

View File

@ -13,16 +13,15 @@ RUN apk add --no-cache \
musl-dev \
zip
ENV TERRAFORM_VERSION v0.12.28
ENV TERRAFORM_VERSION v0.14.7
RUN go get github.com/hashicorp/terraform || true
RUN git clone --depth 1 --branch ${TERRAFORM_VERSION} https://github.com/hashicorp/terraform.git /go/src/github.com/hashicorp/terraform
WORKDIR /go/src/github.com/hashicorp/terraform
RUN git checkout "${TERRAFORM_VERSION}"
RUN XC_ARCH="amd64" XC_OS="linux" LD_FLAGS=" -extldflags -static" make fmt bin \
&& mv bin/terraform /usr/bin/terraform
RUN CGO_ENABLED=0 go build -a -tags netgo -ldflags '-w -extldflags "-static"' \
-o bin/terraform && \
mv bin/terraform /usr/bin/terraform
FROM alpine:latest