Merge branch 'jessfraz:master' into master

This commit is contained in:
ant Kenworthy 2024-05-14 10:29:56 +01:00 committed by GitHub
commit beaa317887
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 31 deletions

View File

@ -3,29 +3,6 @@ LABEL maintainer "Jessie Frazelle <jess@linux.com>"
RUN apk --no-cache add \ RUN apk --no-cache add \
bash \ bash \
libffi \ certbot
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."
ENTRYPOINT [ "certbot" ] ENTRYPOINT [ "certbot" ]

View File

@ -14,16 +14,19 @@ FROM debian:sid-slim
LABEL maintainer "Jessie Frazelle <jess@linux.com>" LABEL maintainer "Jessie Frazelle <jess@linux.com>"
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
ca-certificates \
curl \
dirmngr \ dirmngr \
gnupg \ gnupg \
--no-install-recommends \ --no-install-recommends \
&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4773BD5E130D1D45 \ && curl -sS https://download.spotify.com/debian/pubkey_0D811D58.gpg | apt-key add - \
&& echo "deb http://repository.spotify.com stable non-free" >> /etc/apt/sources.list.d/spotify.list \ && echo "deb http://repository.spotify.com stable non-free" >> /etc/apt/sources.list.d/spotify.list \
&& apt-get update && apt-get install -y \ && apt-get update && apt-get install -y \
alsa-utils \ alsa-utils \
libgl1-mesa-dri \ libgl1-mesa-dri \
libgl1-mesa-glx \ libgl1-mesa-glx \
libpulse0 \ libpulse0 \
libsm6 \
spotify-client \ spotify-client \
xdg-utils \ xdg-utils \
--no-install-recommends \ --no-install-recommends \

View File

@ -13,16 +13,15 @@ RUN apk add --no-cache \
musl-dev \ musl-dev \
zip 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 WORKDIR /go/src/github.com/hashicorp/terraform
RUN git checkout "${TERRAFORM_VERSION}" RUN CGO_ENABLED=0 go build -a -tags netgo -ldflags '-w -extldflags "-static"' \
-o bin/terraform && \
RUN XC_ARCH="amd64" XC_OS="linux" LD_FLAGS=" -extldflags -static" make fmt bin \ mv bin/terraform /usr/bin/terraform
&& mv bin/terraform /usr/bin/terraform
FROM alpine:latest FROM alpine:latest