mirror of
https://github.com/jessfraz/dockerfiles.git
synced 2024-11-23 11:31:49 +01:00
updates and fixes
Signed-off-by: Jess Frazelle <acidburn@google.com>
This commit is contained in:
parent
9bb95aae74
commit
79d82a1190
|
@ -1,4 +1,4 @@
|
||||||
FROM alpine:latest
|
FROM alpine:3.5
|
||||||
LABEL maintainer "Jessie Frazelle <jess@linux.com>"
|
LABEL maintainer "Jessie Frazelle <jess@linux.com>"
|
||||||
|
|
||||||
ENV PATH /go/bin:/usr/local/go/bin:$PATH
|
ENV PATH /go/bin:/usr/local/go/bin:$PATH
|
||||||
|
@ -34,7 +34,10 @@ RUN buildDeps=' \
|
||||||
&& XC_ARCH="amd64" XC_OS="linux" make all \
|
&& XC_ARCH="amd64" XC_OS="linux" make all \
|
||||||
&& mv bin/consul /usr/bin/ \
|
&& mv bin/consul /usr/bin/ \
|
||||||
&& cd ui \
|
&& cd ui \
|
||||||
&& gem install bundler io-console --no-ri --no-rdoc \
|
&& gem install \
|
||||||
|
bundler \
|
||||||
|
io-console \
|
||||||
|
--no-ri --no-rdoc \
|
||||||
&& bundle install \
|
&& bundle install \
|
||||||
&& make dist \
|
&& make dist \
|
||||||
&& mkdir -p /usr/src/consul \
|
&& mkdir -p /usr/src/consul \
|
||||||
|
|
|
@ -44,7 +44,7 @@ RUN set -x \
|
||||||
# gpg: key DDBEF0E1: public key "The Irssi project <staff@irssi.org>" imported
|
# gpg: key DDBEF0E1: public key "The Irssi project <staff@irssi.org>" imported
|
||||||
&& gpg --no-tty --keyserver ha.pool.sks-keyservers.net --recv-keys 7EE65E3082A5FB06AC7C368D00CCB587DDBEF0E1 \
|
&& gpg --no-tty --keyserver ha.pool.sks-keyservers.net --recv-keys 7EE65E3082A5FB06AC7C368D00CCB587DDBEF0E1 \
|
||||||
&& gpg --batch --verify /tmp/irssi.tar.xz.asc /tmp/irssi.tar.xz \
|
&& gpg --batch --verify /tmp/irssi.tar.xz.asc /tmp/irssi.tar.xz \
|
||||||
&& rm -r "$GNUPGHOME" /tmp/irssi.tar.xz.asc \
|
&& rm -rf "$GNUPGHOME" /tmp/irssi.tar.xz.asc \
|
||||||
&& mkdir -p /usr/src \
|
&& mkdir -p /usr/src \
|
||||||
&& tar -xJf /tmp/irssi.tar.xz -C /usr/src \
|
&& tar -xJf /tmp/irssi.tar.xz -C /usr/src \
|
||||||
&& rm /tmp/irssi.tar.xz \
|
&& rm /tmp/irssi.tar.xz \
|
||||||
|
@ -65,7 +65,7 @@ RUN set -x \
|
||||||
# gpg: key 42C2ABAD: public key "OTR Dev Team (Signing Key) <otr@cypherpunks.ca>" imported
|
# gpg: key 42C2ABAD: public key "OTR Dev Team (Signing Key) <otr@cypherpunks.ca>" imported
|
||||||
&& curl -sSL https://otr.cypherpunks.ca/gpgkey.asc | gpg --no-tty --import \
|
&& curl -sSL https://otr.cypherpunks.ca/gpgkey.asc | gpg --no-tty --import \
|
||||||
&& gpg --batch --verify /tmp/libotr.tar.gz.asc /tmp/libotr.tar.gz \
|
&& gpg --batch --verify /tmp/libotr.tar.gz.asc /tmp/libotr.tar.gz \
|
||||||
&& rm -r "$GNUPGHOME" /tmp/libotr.tar.gz.asc \
|
&& rm -rf "$GNUPGHOME" /tmp/libotr.tar.gz.asc \
|
||||||
&& mkdir -p /usr/src/libotr \
|
&& mkdir -p /usr/src/libotr \
|
||||||
&& tar -xzf /tmp/libotr.tar.gz -C /usr/src/libotr --strip-components 1 \
|
&& tar -xzf /tmp/libotr.tar.gz -C /usr/src/libotr --strip-components 1 \
|
||||||
&& rm /tmp/libotr.tar.gz \
|
&& rm /tmp/libotr.tar.gz \
|
||||||
|
@ -81,7 +81,7 @@ RUN set -x \
|
||||||
&& curl -sSL "https://github.com/cryptodotis/irssi-otr/archive/v${IRSSI_OTR_VERSION}.tar.gz" -o /tmp/irssi-otr.tar.gz \
|
&& curl -sSL "https://github.com/cryptodotis/irssi-otr/archive/v${IRSSI_OTR_VERSION}.tar.gz" -o /tmp/irssi-otr.tar.gz \
|
||||||
&& mkdir -p /usr/src/irssi-otr \
|
&& mkdir -p /usr/src/irssi-otr \
|
||||||
&& tar -xf /tmp/irssi-otr.tar.gz -C /usr/src/irssi-otr --strip-components 1 \
|
&& tar -xf /tmp/irssi-otr.tar.gz -C /usr/src/irssi-otr --strip-components 1 \
|
||||||
&& rm /tmp/irssi-otr.tar.gz \
|
&& rm -f /tmp/irssi-otr.tar.gz \
|
||||||
&& ( \
|
&& ( \
|
||||||
cd /usr/src/irssi-otr \
|
cd /usr/src/irssi-otr \
|
||||||
&& ./bootstrap \
|
&& ./bootstrap \
|
||||||
|
|
|
@ -17,6 +17,7 @@ RUN set -x \
|
||||||
cmake \
|
cmake \
|
||||||
curl-dev \
|
curl-dev \
|
||||||
git \
|
git \
|
||||||
|
libressl-dev \
|
||||||
libxml2-dev \
|
libxml2-dev \
|
||||||
&& git clone --depth 1 https://github.com/LastPass/lastpass-cli.git /usr/src/lastpass-cli \
|
&& git clone --depth 1 https://github.com/LastPass/lastpass-cli.git /usr/src/lastpass-cli \
|
||||||
&& ( \
|
&& ( \
|
||||||
|
|
|
@ -17,6 +17,7 @@ RUN set -x \
|
||||||
make \
|
make \
|
||||||
openssl-dev \
|
openssl-dev \
|
||||||
perl-digest-sha1 \
|
perl-digest-sha1 \
|
||||||
|
perl-utils \
|
||||||
tar \
|
tar \
|
||||||
zlib-dev \
|
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-autoconf-${TARSNAP_VERSION}.tgz" -o /tmp/tarsnap.tgz \
|
||||||
|
|
|
@ -28,7 +28,7 @@ RUN useradd --create-home --home-dir $HOME user \
|
||||||
|
|
||||||
ENV LANG C.UTF-8
|
ENV LANG C.UTF-8
|
||||||
|
|
||||||
ENV TOR_VERSION 7.0a2
|
ENV TOR_VERSION 7.0a4
|
||||||
ENV TOR_FINGERPRINT 0x4E2C6E8793298290
|
ENV TOR_FINGERPRINT 0x4E2C6E8793298290
|
||||||
|
|
||||||
# download tor and check signature
|
# download tor and check signature
|
||||||
|
|
|
@ -31,7 +31,7 @@ RUN useradd --create-home --home-dir $HOME user \
|
||||||
|
|
||||||
ENV LANG C.UTF-8
|
ENV LANG C.UTF-8
|
||||||
|
|
||||||
ENV TOR_VERSION 7.0a4
|
ENV TOR_VERSION 6.5.2
|
||||||
ENV TOR_FINGERPRINT 0x4E2C6E8793298290
|
ENV TOR_FINGERPRINT 0x4E2C6E8793298290
|
||||||
|
|
||||||
# download tor and check signature
|
# download tor and check signature
|
||||||
|
|
Loading…
Reference in New Issue
Block a user