fixes

Signed-off-by: Jess Frazelle <me@jessfraz.com>
2024-11-27 04:16:45 +01:00 · 2016-09-20 17:31:29 -07:00 · 2016-09-20 17:31:29 -07:00 · 39e618c3cb
commit 39e618c3cb
parent 23b8c747a8
9 changed files with 45 additions and 43 deletions
--- a/certbot/Dockerfile
+++ b/certbot/Dockerfile
@ -4,6 +4,7 @@ MAINTAINER Jessie Frazelle <jess@linux.com>
 RUN apt-get update && apt-get install -y \
 	ca-certificates \
 	curl \
+	gnupg \
 	--no-install-recommends

 RUN export GNUPGHOME="$(mktemp -d)" \
--- a/cloudapp/Dockerfile
+++ b/cloudapp/Dockerfile
@ -1,10 +1,13 @@
 FROM	ruby:alpine
 MAINTAINER	Jessie Frazelle <jess@linux.com>

-RUN apt-get update && apt-get install -y \
-	libcurl3-dev \
-	--no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& gem install cloudapp
+RUN	apk add --no-cache \
+	libcurl
+
+RUN	set -x \
+	&& apk add --no-cache --virtual .build-deps \
+	build-base \
+	&& gem install cloudapp --no-rdoc --no-ri \
+	&& apk del .build-deps

 ENTRYPOINT	["cloudapp"]
--- a/irssi/Dockerfile
+++ b/irssi/Dockerfile
@ -19,7 +19,7 @@ RUN set -x \
 	&& apk add --no-cache --virtual .build-deps \
 		autoconf \
 		automake \
-		ca-certificates \
+		curl \
 		gcc \
 		glib-dev \
 		gnupg \
@ -35,8 +35,8 @@ RUN set -x \
 		pkgconf \
 		tar \
 		xz \
-	&& wget "https://github.com/irssi/irssi/releases/download/${IRSSI_VERSION}/irssi-${IRSSI_VERSION}.tar.xz" -O /tmp/irssi.tar.xz \
-	&& wget "https://github.com/irssi/irssi/releases/download/${IRSSI_VERSION}/irssi-${IRSSI_VERSION}.tar.xz.asc" -O /tmp/irssi.tar.xz.asc \
+	&& curl -sSL "https://github.com/irssi/irssi/releases/download/${IRSSI_VERSION}/irssi-${IRSSI_VERSION}.tar.xz" -o /tmp/irssi.tar.xz \
+	&& curl -sSL "https://github.com/irssi/irssi/releases/download/${IRSSI_VERSION}/irssi-${IRSSI_VERSION}.tar.xz.asc" -o /tmp/irssi.tar.xz.asc \
 	&& export GNUPGHOME="$(mktemp -d)" \
 # gpg: key DDBEF0E1: public key "The Irssi project <staff@irssi.org>" imported
 	&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 7EE65E3082A5FB06AC7C368D00CCB587DDBEF0E1 \
@ -56,8 +56,8 @@ RUN set -x \
 		&& make -j$(getconf _NPROCESSORS_ONLN) \
 		&& make install \
 	) \
-	&& wget "https://otr.cypherpunks.ca/libotr-${LIB_OTR_VERSION}.tar.gz" -O /tmp/libotr.tar.gz \
-	&& wget "https://otr.cypherpunks.ca/libotr-${LIB_OTR_VERSION}.tar.gz.asc" -O /tmp/libotr.tar.gz.asc \
+	&& curl -sSL "https://otr.cypherpunks.ca/libotr-${LIB_OTR_VERSION}.tar.gz" -o /tmp/libotr.tar.gz \
+	&& curl -sSL "https://otr.cypherpunks.ca/libotr-${LIB_OTR_VERSION}.tar.gz.asc" -o /tmp/libotr.tar.gz.asc \
 	&& export GNUPGHOME="$(mktemp -d)" \
 # gpg: key 42C2ABAD: public key "OTR Dev Team (Signing Key) <otr@cypherpunks.ca>" imported
 	&& gpg --keyserver pgp.mit.edu --recv-keys 22DF3305DF56667CE15784FCF24DE08F42C2ABAD \
@ -75,13 +75,13 @@ RUN set -x \
 		&& make install \
 	) \
 	&& mkdir -p /usr/src/irssi-otr \
-	&& wget "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 \
 	&& tar -xf /tmp/irssi-otr.tar.gz -C /usr/src/irssi-otr --strip-components 1 \
 	&& rm /tmp/irssi-otr.tar.gz \
 	&& ( \
 		cd /usr/src/irssi-otr \
-		&& wget "$PATCH_FOR_IRSSI_OTR" -O patch.diff \
+		&& curl -sSL "$PATCH_FOR_IRSSI_OTR" -o patch.diff \
 		&& patch -p1 < patch.diff \
 		&& ./bootstrap \
 		&& ./configure \
--- a/mitmproxy/Dockerfile
+++ b/mitmproxy/Dockerfile
@ -10,10 +10,6 @@ RUN apt-get update && apt-get install -y \
 	&& rm -rf /var/lib/apt/lists/*

 ENV LANG en_US.UTF-8
-ENV HOME /home/mitm
-RUN useradd --create-home --home-dir $HOME mitm \
-	&& chown -R mitm:mitm $HOME
-
 EXPOSE 8080

 RUN buildDeps=' \
@ -24,14 +20,19 @@ RUN buildDeps=' \
 		libxml2-dev \
 		libxslt1-dev \
 		python-dev \
+		python-setuptools \
 		zlib1g-dev \
 	' \
 	&& set -x \
 	&& apt-get update && apt-get install -y ${buildDeps} --no-install-recommends \
-	&& pip install mitmproxy \
+	&& pip install setuptools mitmproxy \
 	&& apt-get purge -y --auto-remove ${buildDeps} \
 	&& rm -rf /var/lib/apt/lists/*

+ENV HOME /home/mitm
+RUN useradd --create-home --home-dir $HOME mitm \
+	&& chown -R mitm:mitm $HOME
+
 USER mitm

 ENTRYPOINT [ "mitmproxy" ]
--- a/mpsyt/Dockerfile
+++ b/mpsyt/Dockerfile
@ -1,10 +1,9 @@
-FROM python:2-alpine
+FROM python:3-alpine
 MAINTAINER Justin Garrison <justinleegarrison@gmail.com>

-RUN apt-get update && apt-get install -y \
-	mplayer mpv \
-	--no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/*
+RUN apk add --no-cache \
+	mplayer \
+	mpv

 RUN pip install mps-youtube

--- a/rstudio/Dockerfile
+++ b/rstudio/Dockerfile
@ -10,7 +10,7 @@
 #

 # Base docker image
-FROM debian:stretch
+FROM debian:jessie
 MAINTAINER Jessie Frazelle <jess@linux.com>

 ADD https://download1.rstudio.org/rstudio-0.99.484-amd64.deb /src/rstudio.deb
--- a/t/Dockerfile
+++ b/t/Dockerfile
@ -7,10 +7,7 @@ RUN apk add --no-cache \
 RUN	set -x \
 	&& apk add --no-cache --virtual .build-deps \
 	build-base \
-        && gem install \
-                io-console \
-				t \
-                --no-rdoc --no-ri \
+	&& gem install io-console t --no-rdoc --no-ri \
 	&& apk del .build-deps

-ENTRYPOINT [ "t" ]
+ENTRYPOINT	["t"]
--- a/tomahawk/Dockerfile
+++ b/tomahawk/Dockerfile
@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:14.04
 MAINTAINER Jessie Frazelle <jess@linux.com>

 RUN apt-get update && apt-get install -y \
--- a/vscode/Dockerfile
+++ b/vscode/Dockerfile
@ -49,20 +49,21 @@ ENV HOME /home/user
 RUN useradd --create-home --home-dir $HOME user \
 	&& chown -R user:user $HOME

+ENV CODE_VERSION 1.5.2
 # download the source
 RUN buildDeps=' \
 		ca-certificates \
 		curl \
-		unzip \
+		gnupg \
 	' \
 	&& set -x \
 	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
 	&& curl -sL https://deb.nodesource.com/setup | bash - \
 	&& apt-get update && apt-get install -y nodejs --no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/* \
-	&& curl -sSL https://az764295.vo.msecnd.net/stable/fe7f407b95b7f78405846188259504b34ef72761/VSCode-linux-x64-stable.zip -o /tmp/vs.zip \
-	&& unzip /tmp/vs.zip -d /usr/src/ \
-	&& rm -rf /tmp/vs.zip \
+	&& curl -sSL https://az764295.vo.msecnd.net/stable/66f37fd2a99eb9d628dd374d81d78835b410c39b/code_${CODE_VERSION}-1473686317_amd64.deb -o /tmp/vs.deb \
+	&& dpkg -i /tmp/vs.deb \
+	&& rm -rf /tmp/vs.deb \
 	&& apt-get purge -y --auto-remove $buildDeps

 COPY start.sh /usr/local/bin/start.sh