mirror of
https://github.com/jessfraz/dockerfiles.git
synced 2024-11-23 11:31:49 +01:00
fix broken images
Signed-off-by: Jess Frazelle <acidburn@google.com>
This commit is contained in:
parent
f7f8dbab53
commit
9a757b30dd
|
@ -1,32 +1,30 @@
|
|||
FROM debian:sid
|
||||
FROM alpine:latest
|
||||
MAINTAINER Jessie Frazelle <jess@linux.com>
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
RUN apk add --no-cache \
|
||||
ca-certificates \
|
||||
libcurl3 \
|
||||
curl \
|
||||
libxml2 \
|
||||
openssl \
|
||||
pinentry-curses \
|
||||
xclip \
|
||||
--no-install-recommends \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
--repository https://dl-3.alpinelinux.org/alpine/edge/main
|
||||
|
||||
RUN buildDeps=' \
|
||||
gcc \
|
||||
RUN set -x \
|
||||
&& apk add --no-cache --virtual .build-deps \
|
||||
autoconf \
|
||||
automake \
|
||||
build-base \
|
||||
curl-dev \
|
||||
git \
|
||||
libcurl4-openssl-dev \
|
||||
libssl-dev \
|
||||
libxml2-dev \
|
||||
make \
|
||||
' \
|
||||
&& set -x \
|
||||
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
|
||||
&& rm -rf /var/lib/apt/lists/* \
|
||||
openssl-dev \
|
||||
&& git clone --depth 1 https://github.com/LastPass/lastpass-cli.git /usr/src/lastpass-cli \
|
||||
&& cd /usr/src/lastpass-cli \
|
||||
&& make \
|
||||
&& make install \
|
||||
&& ( \
|
||||
cd /usr/src/lastpass-cli \
|
||||
&& make \
|
||||
&& make install \
|
||||
) \
|
||||
&& rm -rf /usr/src/lastpass-cli \
|
||||
&& apt-get purge -y --auto-remove $buildDeps
|
||||
&& apk del .build-deps
|
||||
|
||||
ENTRYPOINT [ "lpass" ]
|
||||
|
|
|
@ -25,7 +25,7 @@ RUN apt-get update && apt-get install -y \
|
|||
qtbase5-dev \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ENV RICOCHET_VERSION 1.1.2
|
||||
ENV RICOCHET_VERSION 1.1.4
|
||||
ENV RICOCHET_FINGERPRINT 0xFF97C53F183C045D
|
||||
|
||||
RUN buildDeps=' \
|
||||
|
@ -36,13 +36,13 @@ RUN buildDeps=' \
|
|||
&& set -x \
|
||||
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
|
||||
&& rm -rf /var/lib/apt/lists/* \
|
||||
&& curl -sSL https://ricochet.im/releases/latest/ricochet-${RICOCHET_VERSION}-static-x86_64.tar.bz2 -o /tmp/ricochet.tar.bz2 \
|
||||
&& curl -sSL https://ricochet.im/releases/latest/ricochet-${RICOCHET_VERSION}-static-x86_64.tar.bz2.asc -o /tmp/ricochet.tar.bz2.asc \
|
||||
&& curl -sSL "https://ricochet.im/releases/${RICOCHET_VERSION}/ricochet-${RICOCHET_VERSION}-linux-x86_64.tar.bz2" -o /tmp/ricochet.tar.bz2 \
|
||||
&& curl -sSL "https://ricochet.im/releases/${RICOCHET_VERSION}/ricochet-${RICOCHET_VERSION}-linux-x86_64.tar.bz2.asc" -o /tmp/ricochet.tar.bz2.asc \
|
||||
&& export GNUPGHOME="$(mktemp -d)" \
|
||||
&& chmod 600 "${GNUPGHOME}" \
|
||||
&& gpg --keyserver pgp.mit.edu --recv-keys ${RICOCHET_FINGERPRINT} \
|
||||
&& curl -sSL https://ricochet.im/john-brooks.asc | gpg --import \
|
||||
&& gpg --fingerprint --keyid-format LONG ${RICOCHET_FINGERPRINT} | grep "9032 CAE4 CBFA 933A 5A21 45D5 FF97 C53F 183C 045D" \
|
||||
&& gpg /tmp/ricochet.tar.bz2.asc \
|
||||
&& gpg --verify /tmp/ricochet.tar.bz2.asc \
|
||||
&& tar -vxj --strip-components 1 -C /usr/local/bin -f /tmp/ricochet.tar.bz2 \
|
||||
&& rm -rf /tmp/ricochet* \
|
||||
&& rm -rf "${GNUPGHOME}" \
|
||||
|
|
|
@ -1,26 +1,24 @@
|
|||
FROM debian:sid
|
||||
FROM alpine:latest
|
||||
MAINTAINER Jessie Frazelle <jess@linux.com>
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
RUN apk add --no-cache \
|
||||
ca-certificates \
|
||||
gnupg \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ENV TARSNAP_VERSION 1.0.37
|
||||
|
||||
RUN buildDeps=' \
|
||||
RUN set -x \
|
||||
&& apk add --no-cache --virtual .build-deps \
|
||||
build-base \
|
||||
curl \
|
||||
e2fslibs-dev \
|
||||
gcc \
|
||||
libc6-dev \
|
||||
libdigest-sha-perl \
|
||||
libssl-dev \
|
||||
e2fsprogs-libs \
|
||||
e2fsprogs-dev \
|
||||
make \
|
||||
zlib1g-dev \
|
||||
' \
|
||||
&& set -x \
|
||||
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
|
||||
&& rm -rf /var/lib/apt/lists/* \
|
||||
openssl-dev \
|
||||
perl-digest-sha1 \
|
||||
tar \
|
||||
zlib-dev \
|
||||
&& curl -sSL "https://www.tarsnap.com/download/tarsnap-autoconf-${TARSNAP_VERSION}.tgz" -o /tmp/tarsnap.tgz \
|
||||
&& curl -sSL "https://www.tarsnap.com/download/tarsnap-sigs-${TARSNAP_VERSION}.asc" -o /tmp/tarsnap.tgz.asc \
|
||||
&& curl -sSL "https://www.tarsnap.com/tarsnap-signing-key-2015.asc" | gpg --import \
|
||||
|
@ -29,11 +27,14 @@ RUN buildDeps=' \
|
|||
&& mkdir -p /usr/src/tarsnap \
|
||||
&& tar -xzf /tmp/tarsnap.tgz -C /usr/src/tarsnap --strip-components 1 \
|
||||
&& rm /tmp/tarsnap.tgz* \
|
||||
&& cd /usr/src/tarsnap \
|
||||
&& ./configure --prefix=/usr \
|
||||
&& make \
|
||||
&& make install \
|
||||
&& ( \
|
||||
cd /usr/src/tarsnap \
|
||||
&& ./configure --prefix=/usr \
|
||||
&& make \
|
||||
&& make install \
|
||||
) \
|
||||
&& rm -rf /usr/src/tarsnap \
|
||||
&& apt-get purge -y --auto-remove $buildDeps
|
||||
&& apk del .build-deps
|
||||
|
||||
CMD [ "tarsnap", "--help" ]
|
||||
ENTRYPOINT [ "tarsnap" ]
|
||||
CMD [ "--help" ]
|
||||
|
|
Loading…
Reference in New Issue
Block a user