From 46b0c075f6130ec488ea5ccb05bee43dad0215c4 Mon Sep 17 00:00:00 2001
From: Joseph Schorr <joseph.schorr@coreos.com>
Date: Thu, 22 Mar 2018 14:57:11 -0400
Subject: [PATCH] Fix Dockerfiles for broken Go compile and remove temp
 memcache install

---
 Dockerfile           | 3 ---
 quay-base.dockerfile | 8 ++++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 12b6cd5e7..30504e666 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,9 +4,6 @@ FROM quay.io/quay/quay-base:latest
 
 RUN adduser memcached --disabled-login --system
 
-# TEMP FIX
-RUN apt-get update && apt-get install -y memcached
-
 WORKDIR $QUAYDIR
 
 COPY requirements.txt requirements-tests.txt ./
diff --git a/quay-base.dockerfile b/quay-base.dockerfile
index 0df7fed6b..21e5dc88f 100644
--- a/quay-base.dockerfile
+++ b/quay-base.dockerfile
@@ -55,15 +55,15 @@ RUN apt-get update && apt-get upgrade -y \
      python-pip        \
      python-virtualenv \
      yarn=0.22.0-1     \
-     w3m # 19DEC2017
+     w3m # 22MAR2018
 
 # Install cfssl
 RUN mkdir /gocode
 ENV GOPATH /gocode
-RUN curl -O https://storage.googleapis.com/golang/go1.6.linux-amd64.tar.gz && \
-    tar -xvf go1.6.linux-amd64.tar.gz && \
+RUN curl -O https://storage.googleapis.com/golang/go1.10.linux-amd64.tar.gz && \
+    tar -xvf go1.10.linux-amd64.tar.gz && \
     mv go /usr/local && \
-    rm -rf go1.6.linux-amd64.tar.gz && \
+    rm -rf go1.10.linux-amd64.tar.gz && \
     /usr/local/go/bin/go get -u github.com/cloudflare/cfssl/cmd/cfssl && \
     /usr/local/go/bin/go get -u github.com/cloudflare/cfssl/cmd/cfssljson && \
     cp /gocode/bin/cfssljson /bin/cfssljson && \