summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
dbc2c0e)
Removes the apt proxy configuration from the final
image layers
Change-Id: I3f2dfd81a04b42d3ee570cdc71ca41da39e621d0
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>
ca-certificates \
&& rm -rf /var/lib/apt/lists/*
ca-certificates \
&& 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
ca-certificates \
&& rm -rf /var/lib/apt/lists/*
ca-certificates \
&& 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/bin/osm* /usr/bin/
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/bin/osm* /usr/bin/
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
nginx=1.18.* && \
rm -rf /var/lib/apt/lists/*
nginx=1.18.* && \
rm -rf /var/lib/apt/lists/*
+RUN rm -f /etc/apt/apt.conf.d/proxy.conf
+
# Removing the Nginx default page.
RUN rm -rf /usr/share/nginx/html/*
# Removing the Nginx default page.
RUN rm -rf /usr/share/nginx/html/*
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 ;\
- 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 ;\
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
+
LABEL authors="Lars-Göran Magnusson"
COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages
LABEL authors="Lars-Göran Magnusson"
COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages
WORKDIR /app/osm_pla
# Changing the security context
WORKDIR /app/osm_pla
# Changing the security context
ENV OSMPLA_MESSAGE_DRIVER kafka
ENV OSMPLA_MESSAGE_HOST kafka
ENV OSMPLA_MESSAGE_DRIVER kafka
ENV OSMPLA_MESSAGE_HOST kafka
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/bin/osm* /usr/bin/
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/bin/osm* /usr/bin/
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/bin/genisoimage /usr/bin/genisoimage
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/bin/genisoimage /usr/bin/genisoimage
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 ;\
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.* \
ARG PYTHON3_OSMCLIENT_URL
ARG PYTHON3_OSM_IM_URL
ARG PYTHON3_OSMCLIENT_URL
ARG PYTHON3_OSM_IM_URL
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