projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 1858: Adding APT proxy
[osm/devops.git]
/
docker
/
tests
/
Dockerfile
diff --git
a/docker/tests/Dockerfile
b/docker/tests/Dockerfile
index
4874ef1
..
4f7ef7c
100644
(file)
--- a/
docker/tests/Dockerfile
+++ b/
docker/tests/Dockerfile
@@
-1,4
+1,5
@@
-# Copyright 2020 ETSI
+#######################################################################################
+# Copyright ETSI Contributors and Others.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-12,11
+13,16
@@
# implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-
-########################################################################
+#######################################################################################
FROM ubuntu:18.04 as INSTALL
FROM ubuntu:18.04 as INSTALL
+ARG APT_PROXY
+RUN if [ ! -z $APT_PROXY ] ; then \
+ echo "Acquire::http::Proxy \"$APT_PROXY\";" > /etc/apt/apt.conf.d/proxy.conf ;\
+ echo "Acquire::https::Proxy \"$APT_PROXY\";" >> /etc/apt/apt.conf.d/proxy.conf ;\
+ fi
+
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
DEBIAN_FRONTEND=noninteractive apt-get --yes install \
gcc=4:7.4.* \
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
DEBIAN_FRONTEND=noninteractive apt-get --yes install \
gcc=4:7.4.* \