From e419219cde770d4ad197167d3dc6549bc9e3c2f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andre=20Schr=C3=B6der?= Date: Fri, 13 Nov 2020 23:29:57 +0100 Subject: [PATCH 1/4] Fix Spotify not running and building (#555) I could neither run the upstream Docker image nor could I build the Dockerfile. Bug 1 ----- Cannot run the upstream image: ``` docker pull jess/spotify docker run -it --rm jess/spotify spotify: error while loading shared libraries: libSM.so.6: cannot open shared object file: No such file or directory ``` Solution to bug 1 ----------------- Install `libsm6` Bug 2 ----- Cannot build the Dockerfile: ``` cd dockerfiles/spotify docker build . --pull [...] Warning: apt-key is deprecated. Manage keyring files in trusted.gpg.d instead (see apt-key(8)). Executing: /tmp/apt-key-gpghome.k3eQma7IzG/gpg.1.sh --keyserver keyserver.ubuntu.com --recv-keys 4773BD5E130D1D45 gpg: key 4773BD5E130D1D45: public key "Spotify Public Repository Signing Key " imported gpg: Total number processed: 1 gpg: imported: 1 Hit:1 http://deb.debian.org/debian sid InRelease Get:2 http://repository.spotify.com stable InRelease [3316 B] Err:2 http://repository.spotify.com stable InRelease The following signatures couldn't be verified because the public key is not available: NO_PUBKEY D1742AD60D811D58 Reading package lists... W: GPG error: http://repository.spotify.com stable InRelease: The following signatures couldn't be verified because the public key is not available: NO_PUBKEY D1742AD60D811D58 E: The repository 'http://repository.spotify.com stable InRelease' is not signed. The command '/bin/sh -c apt-get update && apt-get install -y dirmngr gnupg --no-install-recommends apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4773BD5E130D1D45 echo "deb http://repository.spotify.com stable non-free" >> /etc/apt/sources.list.d/spotify.list && apt-get update && apt-get install -y sa-utils libgl1-mesa-dri libgl1-mesa-glx libpulse0 spotify-client utils --no-install-recommends && rm -rf /var/lib/apt/lists/*' returned a non-zero code: 100 ``` Solution to bug 2 ----------------- Replaced instructions to retrieve the key with the official instructions from https://www.spotify.com/us/download/linux/ --- spotify/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spotify/Dockerfile b/spotify/Dockerfile index 02ae7b4..475c77e 100644 --- a/spotify/Dockerfile +++ b/spotify/Dockerfile @@ -14,16 +14,19 @@ FROM debian:sid-slim LABEL maintainer "Jessie Frazelle " RUN apt-get update && apt-get install -y \ + ca-certificates \ + curl \ dirmngr \ gnupg \ --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 \ && apt-get update && apt-get install -y \ alsa-utils \ libgl1-mesa-dri \ libgl1-mesa-glx \ libpulse0 \ + libsm6 \ spotify-client \ xdg-utils \ --no-install-recommends \ From 4dc0ff2b6cc1bb5bdb5bf5732e46a276ae28f5a4 Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Tue, 9 Mar 2021 09:51:46 -0800 Subject: [PATCH 2/4] update terraform Signed-off-by: Jess Frazelle --- terraform/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/terraform/Dockerfile b/terraform/Dockerfile index eba2a95..a0e0638 100644 --- a/terraform/Dockerfile +++ b/terraform/Dockerfile @@ -13,7 +13,7 @@ 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 @@ -21,8 +21,9 @@ 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 From 39309ee3d7700944979e664d8528d4aec9703320 Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Fri, 12 Mar 2021 11:21:10 -0800 Subject: [PATCH 3/4] fix terraform Signed-off-by: Jess Frazelle --- terraform/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/terraform/Dockerfile b/terraform/Dockerfile index a0e0638..a5af8f0 100644 --- a/terraform/Dockerfile +++ b/terraform/Dockerfile @@ -15,12 +15,10 @@ RUN apk add --no-cache \ 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 CGO_ENABLED=0 go build -a -tags netgo -ldflags '-w -extldflags "-static"' \ -o bin/terraform && \ mv bin/terraform /usr/bin/terraform From 8ff991327fd1c68369c2fb576215d0eabffca0e1 Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Sat, 27 Mar 2021 11:30:56 -0700 Subject: [PATCH 4/4] fix certbot Signed-off-by: Jess Frazelle --- certbot/Dockerfile | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/certbot/Dockerfile b/certbot/Dockerfile index 28edf89..3c6b819 100644 --- a/certbot/Dockerfile +++ b/certbot/Dockerfile @@ -3,29 +3,6 @@ LABEL maintainer "Jessie Frazelle " 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" ]