Update Thrift to 0.12

[ahawkins]

Reference: ahawkins/docker-thrift#16

[tianon]

You probably want to take a look at ahawkins/docker-thrift#12 -- jking there is part of the Thrift project upstream and seems to be interested in some kind of collaboration (or at least clarification). ❤️

[tianon]

It would appear there's a typo here -- this probably should've been ahawkins/docker-thrift instead of ahawkins-docker-thrift. 😅

[jpkrohling]

You probably want to take a look at ahawkins/docker-thrift#12 -- jking there is part of the Thrift project upstream and seems to be interested in some kind of collaboration (or at least clarification).

+1 but could we please get 0.12 available before that? 0.11 has a CVE that is fixed by 0.12... (cc @jeking3)

[jpkrohling]

Any news to this one?

[ahawkins]

@tianon fixed

[yosifkit]

Diff:

warning: insecure protocol git:// detected: git://github.com/ahawkins/docker-thrift
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 5af0b77..ec996aa 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,3 +1,4 @@
 thrift:0.9.3 @ amd64
 thrift:0.10.0 @ amd64
+thrift:0.11.0 @ amd64
 thrift:latest @ amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index f4daeb5..7fd5d20 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -4,4 +4,6 @@ thrift:0.10
 thrift:0.10.0
 thrift:0.11
 thrift:0.11.0
+thrift:0.12
+thrift:0.12.0
 thrift:latest
diff --git a/thrift_latest/Dockerfile b/thrift_0.11.0/Dockerfile
similarity index 100%
copy from thrift_latest/Dockerfile
copy to thrift_0.11.0/Dockerfile
diff --git a/thrift_latest/Dockerfile b/thrift_latest/Dockerfile
index a98ed4f..9791366 100644
--- a/thrift_latest/Dockerfile
+++ b/thrift_latest/Dockerfile
@@ -1,7 +1,6 @@
-FROM debian:wheezy
-LABEL authors="Adam Hawkins <hi@ahawkins.me>"
+FROM ubuntu:18.04
 
-ENV THRIFT_VERSION 0.11.0
+ENV THRIFT_VERSION v0.12.0
 
 RUN buildDeps=" \
 		automake \
@@ -21,21 +20,22 @@ RUN buildDeps=" \
 		pkg-config \
 	"; \
 	apt-get update && apt-get install -y --no-install-recommends $buildDeps && rm -rf /var/lib/apt/lists/* \
-	&& curl -sSL "http://apache.mirrors.spacedump.net/thrift/$THRIFT_VERSION/thrift-$THRIFT_VERSION.tar.gz" -o thrift.tar.gz \
+	&& curl -k -sSL "https://github.com/apache/thrift/archive/${THRIFT_VERSION}.tar.gz" -o thrift.tar.gz \
 	&& mkdir -p /usr/src/thrift \
 	&& tar zxf thrift.tar.gz -C /usr/src/thrift --strip-components=1 \
 	&& rm thrift.tar.gz \
 	&& cd /usr/src/thrift \
-	&& ./configure  --without-python --without-cpp \
+	&& ./bootstrap.sh \
+	&& ./configure --disable-libs \
 	&& make \
 	&& make install \
 	&& cd / \
 	&& rm -rf /usr/src/thrift \
-	&& curl -k -sSL "https://storage.googleapis.com/golang/go1.4.linux-amd64.tar.gz" -o go.tar.gz \
-	&& tar xzf go.tar.gz \
-	&& rm go.tar.gz \
-	&& cp go/bin/gofmt /usr/bin/gofmt \
-	&& rm -rf go \
-	&& apt-get purge -y --auto-remove $buildDeps
+	&& apt-get purge -y --auto-remove $buildDeps \
+	&& rm -rf /var/cache/apt/* \
+	&& rm -rf /var/lib/apt/lists/* \
+	&& rm -rf /tmp/* \
+	&& rm -rf /var/tmp/*
+
 
 CMD [ "thrift" ]

[yosifkit]

Build test of #5411; 97a4f53; amd64 (thrift):

$ bashbrew build thrift:0.9
Building bashbrew/cache:102aacb01e4643af0c5b1399ae31b01e12ab9060caccd00874ab4f0261e84530 (thrift:0.9)
Tagging thrift:0.9
Tagging thrift:0.9.3

$ test/run.sh thrift:0.9
testing thrift:0.9
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build thrift:0.10
Building bashbrew/cache:43f79c07f791a10c7873ee4fa8ab384a68219f0c9f78c5e872f5fc497f998f4d (thrift:0.10)
Tagging thrift:0.10
Tagging thrift:0.10.0

$ test/run.sh thrift:0.10
testing thrift:0.10
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build thrift:0.11
Building bashbrew/cache:b3bd128c36282fb6278d9891e645525a97128d2fcf89830e5cf8d8be6996cacd (thrift:0.11)
Tagging thrift:0.11
Tagging thrift:0.11.0

$ test/run.sh thrift:0.11
testing thrift:0.11
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build thrift:0.12
Building bashbrew/cache:89e7fe7902a059880f93ad470e6cddf7ba720331fffa6f266af5d9d5e4ad7a73 (thrift:0.12)
Tagging thrift:0.12
Tagging thrift:0.12.0
Tagging thrift:latest

$ test/run.sh thrift:0.12
testing thrift:0.12
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed