projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert juju agent version
[osm/devops.git]
/
docker
/
osmclient
/
Dockerfile
diff --git
a/docker/osmclient/Dockerfile
b/docker/osmclient/Dockerfile
index
088cd4d
..
ae4a1ab
100644
(file)
--- a/
docker/osmclient/Dockerfile
+++ b/
docker/osmclient/Dockerfile
@@
-17,12
+17,6
@@
FROM ubuntu:20.04 as INSTALL
FROM ubuntu:20.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
-
ARG APT_PROXY
RUN if [ ! -z $APT_PROXY ] ; then \
echo "Acquire::http::Proxy \"$APT_PROXY\";" > /etc/apt/apt.conf.d/proxy.conf ;\
ARG APT_PROXY
RUN if [ ! -z $APT_PROXY ] ; then \
echo "Acquire::http::Proxy \"$APT_PROXY\";" > /etc/apt/apt.conf.d/proxy.conf ;\
@@
-41,7
+35,7
@@
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
DEBIAN_FRONTEND=noninteractive apt-get --yes install \
libcurl4-openssl-dev=7.68.* \
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
DEBIAN_FRONTEND=noninteractive apt-get --yes install \
libcurl4-openssl-dev=7.68.* \
- libssl-dev=1.1.*
+ libssl-dev=1.1.*
ARG PYTHON3_OSMCLIENT_URL
ARG PYTHON3_OSM_IM_URL
ARG PYTHON3_OSMCLIENT_URL
ARG PYTHON3_OSM_IM_URL
@@
-70,6
+64,8
@@
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
python3-minimal=3.8.* \
&& rm -rf /var/lib/apt/lists/*
python3-minimal=3.8.* \
&& rm -rf /var/lib/apt/lists/*
+RUN rm -f /etc/apt/apt.conf.d/proxy.conf
+
COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages
COPY --from=INSTALL /usr/local/lib/python3.8/dist-packages /usr/local/lib/python3.8/dist-packages
COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages
COPY --from=INSTALL /usr/local/lib/python3.8/dist-packages /usr/local/lib/python3.8/dist-packages