Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
SOL002-SOL003
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Miguel Angel Reina Ortega
SOL002-SOL003
Commits
38ec5831
Commit
38ec5831
authored
7 years ago
by
Michele Carignani
Committed by
Gerrit Code Review
7 years ago
Browse files
Options
Downloads
Plain Diff
Merge "Making it possible to build behind a corporate proxy"
parents
75951eda
ba24ee92
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docker/Dockerfile
+1
-7
1 addition, 7 deletions
docker/Dockerfile
docker/build-container.sh
+1
-1
1 addition, 1 deletion
docker/build-container.sh
with
2 additions
and
8 deletions
docker/Dockerfile
+
1
−
7
View file @
38ec5831
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
docker/build-container.sh
+
1
−
1
View file @
38ec5831
...
...
@@ -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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment