Compare commits

...

5 Commits

Author SHA1 Message Date
ant Kenworthy
beaa317887 Merge branch 'jessfraz:master' into master 2024-05-14 10:29:56 +01:00
Jess Frazelle
8ff991327f fix certbot
Signed-off-by: Jess Frazelle <jess@oxide.computer>
2021-03-27 11:30:56 -07:00
Jess Frazelle
39309ee3d7 fix terraform
Signed-off-by: Jess Frazelle <jess@oxide.computer>
2021-03-12 11:21:10 -08:00
Jess Frazelle
4dc0ff2b6c update terraform
Signed-off-by: Jess Frazelle <jess@oxide.computer>
2021-03-09 09:51:46 -08:00
Andre Schröder
e419219cde 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 <tux@spotify.com>" 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/
2020-11-13 14:29:57 -08:00
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 \
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

@@ -14,16 +14,19 @@ FROM debian:sid-slim
LABEL maintainer "Jessie Frazelle <jess@linux.com>"
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 \

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