vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #3034 from coreos-inc/fix-dockerfiles

Browse source 
Fix Dockerfiles for broken Go compile and remove temp memcache install
This commit is contained in:
josephschorr 2018-03-26 11:38:36 -04:00 committed by GitHub
commit 49659fc3dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Dockerfile
View file

@ -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 ./

8
quay-base.dockerfile
View file

@ -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 && \