updates and fixes

Signed-off-by: Jess Frazelle <[email protected]>

consul/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:latest
+FROM alpine:3.5
 LABEL maintainer "Jessie Frazelle <[email protected]>"
 
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
@@ -34,7 +34,10 @@ RUN buildDeps=' \
 	&& XC_ARCH="amd64" XC_OS="linux" make all \
 	&& mv bin/consul /usr/bin/ \
 	&& cd ui \
-	&& gem install bundler io-console --no-ri --no-rdoc \
+	&& gem install \
+		bundler \
+		io-console \
+		--no-ri --no-rdoc \
 	&& bundle install \
 	&& make dist \
 	&& mkdir -p /usr/src/consul \

irssi/Dockerfile

@@ -44,7 +44,7 @@ RUN set -x \
 # gpg: key DDBEF0E1: public key "The Irssi project <[email protected]>" imported
 	&& gpg --no-tty --keyserver ha.pool.sks-keyservers.net --recv-keys 7EE65E3082A5FB06AC7C368D00CCB587DDBEF0E1 \
 	&& 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 \
 	&& tar -xJf /tmp/irssi.tar.xz -C /usr/src \
 	&& rm /tmp/irssi.tar.xz \
@@ -65,7 +65,7 @@ RUN set -x \
 # gpg: key 42C2ABAD: public key "OTR Dev Team (Signing Key) <[email protected]>" imported
 	&& curl -sSL https://otr.cypherpunks.ca/gpgkey.asc | gpg --no-tty --import \
 	&& 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 \
 	&& tar -xzf /tmp/libotr.tar.gz -C /usr/src/libotr --strip-components 1 \
 	&& 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 \
 	&& mkdir -p /usr/src/irssi-otr \
 	&& 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 \
 		&& ./bootstrap \

lpass/Dockerfile

@@ -17,6 +17,7 @@ RUN set -x \
 		cmake \
 		curl-dev \
 		git \
+		libressl-dev \
 		libxml2-dev \
 	&& git clone --depth 1 https://github.com/LastPass/lastpass-cli.git /usr/src/lastpass-cli \
 	&& ( \

tarsnap/Dockerfile

@@ -17,6 +17,7 @@ RUN set -x \
 		make \
 		openssl-dev \
 		perl-digest-sha1 \
+		perl-utils \
 		tar \
 		zlib-dev \
 	&& curl -sSL "https://www.tarsnap.com/download/tarsnap-autoconf-${TARSNAP_VERSION}.tgz" -o /tmp/tarsnap.tgz \

tor-browser/alpha/Dockerfile

@@ -28,7 +28,7 @@ RUN useradd --create-home --home-dir $HOME user \
 
 ENV LANG C.UTF-8
 
-ENV TOR_VERSION 7.0a2
+ENV TOR_VERSION 7.0a4
 ENV TOR_FINGERPRINT 0x4E2C6E8793298290
 
 # download tor and check signature

tor-browser/stable/Dockerfile

@@ -31,7 +31,7 @@ RUN useradd --create-home --home-dir $HOME user \
 
 ENV LANG C.UTF-8
 
-ENV TOR_VERSION 7.0a4
+ENV TOR_VERSION 6.5.2
 ENV TOR_FINGERPRINT 0x4E2C6E8793298290
 
 # download tor and check signature