projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Adding TCP Dump"
[osm/devops.git]
/
Dockerfile
diff --git
a/Dockerfile
b/Dockerfile
index
5717b7a
..
931da3e
100644
(file)
--- a/
Dockerfile
+++ b/
Dockerfile
@@
-25,9
+25,12
@@
#
FROM ubuntu:18.04
#
FROM ubuntu:18.04
-ENV LANG en_IN.UTF-8
-ENV LC_ALL en_IN.UTF-8
-ENV LANGUAGE en_IN.UTF-8
+
+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 update && \
DEBIAN_FRONTEND=noninteractive apt-get -y install \
RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get -y install \
@@
-41,3
+44,7
@@
RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
RUN python3 -m easy_install pip==21.0.1
RUN pip3 install tox==3.22.0
RUN python3 -m easy_install pip==21.0.1
RUN pip3 install tox==3.22.0
+
+ENV LC_ALL C.UTF-8
+ENV LANG C.UTF-8
+