From 245e7d426e177736886e951895179e1215bdd0c9 Mon Sep 17 00:00:00 2001
From: Jess Frazelle <acidburn@google.com>
Date: Thu, 5 Jan 2017 17:31:45 -0800
Subject: [PATCH] versions

Signed-off-by: Jess Frazelle <acidburn@google.com>
---
 atom/Dockerfile    |  2 +-
 certbot/Dockerfile | 59 +++++++++++++++++++++++++++++++---------------
 irssi/Dockerfile   |  2 +-
 latest-versions.sh |  1 +
 4 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/atom/Dockerfile b/atom/Dockerfile
index 27ba754..3eca91d 100644
--- a/atom/Dockerfile
+++ b/atom/Dockerfile
@@ -42,7 +42,7 @@ RUN apt-get update && apt-get install -y \
 	--no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
-ENV ATOM_VERSION 1.12.7
+ENV ATOM_VERSION 1.12.9
 
 # download the source
 RUN buildDeps=' \
diff --git a/certbot/Dockerfile b/certbot/Dockerfile
index 8799abf..f999398 100644
--- a/certbot/Dockerfile
+++ b/certbot/Dockerfile
@@ -1,23 +1,44 @@
-FROM debian:stretch
+FROM alpine:latest
 MAINTAINER Jessie Frazelle <jess@linux.com>
 
-RUN apt-get update && apt-get install -y \
-	ca-certificates \
-	curl \
-	dirmngr \
-	gnupg \
-	--no-install-recommends
+RUN apk --no-cache add \
+	python \
+	py-cffi \
+	py-configargparse \
+	py-configobj \
+	py-cryptography \
+	py-dialog \
+	py-enum34 \
+	py-idna \
+	py-ipaddress \
+	py-mock \
+	py-openssl \
+	py-parsedatetime \
+	py-pip \
+	py-requests \
+	py-rfc3339 \
+	py-setuptools \
+	py-six \
+	py-tz \
+	py-zope-component \
+	py-zope-event \
+	py-zope-interface
 
-RUN export GNUPGHOME="$(mktemp -d)" \
-	&& gpg --no-tty --keyserver pgp.mit.edu --recv-key A2CFB51FA275A7286234E7B24D17C995CD9775F2 \
-	&& ( \
-	cd /tmp \
-	&& curl -O https://dl.eff.org/certbot-auto \
-	&& chmod a+x ./certbot-auto \
-	&& curl -O https://dl.eff.org/certbot-auto.asc \
-	&& gpg --trusted-key 4D17C995CD9775F2 --verify certbot-auto.asc certbot-auto \
-	&& mv certbot-auto /usr/local/bin/ \
-	) \
-	&& rm -r "$GNUPGHOME"
+RUN pip install acme
 
-ENTRYPOINT [ "certbot-auto" ]
+ENV CERTBOT_VERSION 0.9.3
+
+RUN buildDeps=' \
+		git \
+	' \
+	set -x \
+	&& apk --no-cache add $buildDeps \
+	&& git clone --depth 1 --branch "v$CERTBOT_VERSION" https://github.com/certbot/certbot /usr/src/certbot \
+	&& cd /usr/src/certbot \
+	&& python2 setup.py build || return 1 \
+	&& python2 setup.py install --prefix=/usr || return 1 \
+	&& rm -rf /usr/src/certbot \
+	&& apk del $buildDeps \
+	&& echo "Build complete."
+
+ENTRYPOINT [ "certbot" ]
diff --git a/irssi/Dockerfile b/irssi/Dockerfile
index 548521a..a0fe270 100644
--- a/irssi/Dockerfile
+++ b/irssi/Dockerfile
@@ -13,7 +13,7 @@ RUN adduser -u 1001 -D user \
 
 ENV LANG C.UTF-8
 
-ENV IRSSI_VERSION 0.8.20
+ENV IRSSI_VERSION 1.0.0
 ENV LIB_OTR_VERSION 4.1.1
 ENV IRSSI_OTR_VERSION 1.0.2
 
diff --git a/latest-versions.sh b/latest-versions.sh
index 1228b80..078376a 100755
--- a/latest-versions.sh
+++ b/latest-versions.sh
@@ -49,6 +49,7 @@ get_latest() {
 projects=(
 atom/atom
 camlistore/camlistore
+certbot/certbot
 hashicorp/consul
 CouchPotato/CouchPotatoServer
 pooler/cpuminer