Commit 38ec5831 authored by Michele Carignani's avatar Michele Carignani Committed by Gerrit Code Review
Browse files

Merge "Making it possible to build behind a corporate proxy"

parents 75951eda ba24ee92

docker/Dockerfile

+1 −7
Original line number Diff line number Diff line
@@ -3,12 +3,6 @@ 


FROM alpine:3.6



#ENV http_proxy http://10.144.1.10:8080

#ENV https_proxy something

#ENV HTTP_PROXY

#ENV HTTPS_PROXY

#ENV no_proxy



RUN env

RUN apk update

RUN apk add bash
@@ -16,7 +10,7 @@ RUN apk add nodejs 
RUN apk add nodejs-npm

RUN apk add asciidoctor

RUN apk add openjdk8

RUN apk add ca-certificates && update-ca-certificates 

RUN apk add ca-certificates wget && update-ca-certificates 

RUN apk add openssl

RUN gem install rdoc --pre || gem install rdoc --pre

RUN gem install asciidoctor-pdf-cjk

docker/build-container.sh

+1 −1
Original line number Diff line number Diff line
@@ -22,4 +22,4 @@ fi 


echo "Proxy set to $proxy"



docker build --build-arg http_proxy=$proxy -t openapivalidator .
 
 No newline at end of file
 
docker build --build-arg http_proxy=$proxy --build-arg https_proxy=$proxy -t openapivalidator .
 
 No newline at end of file