projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update Dockerfiles to remove pyangbind patch
[osm/devops.git]
/
docker
/
POL
/
Dockerfile
diff --git
a/docker/POL/Dockerfile
b/docker/POL/Dockerfile
index
f264fba
..
2216338
100644
(file)
--- a/
docker/POL/Dockerfile
+++ b/
docker/POL/Dockerfile
@@
-33,7
+33,7
@@
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
&& rm -rf /var/lib/apt/lists/*
#######################################################################################
&& rm -rf /var/lib/apt/lists/*
#######################################################################################
-# End of common prepration
+# End of common prep
a
ration
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
DEBIAN_FRONTEND=noninteractive apt-get --yes install \
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
DEBIAN_FRONTEND=noninteractive apt-get --yes install \
@@
-70,11
+70,7
@@
COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-package
COPY --from=INSTALL /usr/local/lib/python3.10/dist-packages /usr/local/lib/python3.10/dist-packages
#######################################################################################
COPY --from=INSTALL /usr/local/lib/python3.10/dist-packages /usr/local/lib/python3.10/dist-packages
#######################################################################################
-# End of common prepration
-RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
- DEBIAN_FRONTEND=noninteractive apt-get --yes install \
- libmd0 \
- && rm -rf /var/lib/apt/lists/*
+# End of common preparation
COPY --from=INSTALL /usr/bin/osm* /usr/bin/
COPY --from=INSTALL /usr/bin/mysql /usr/bin/
COPY --from=INSTALL /usr/bin/osm* /usr/bin/
COPY --from=INSTALL /usr/bin/mysql /usr/bin/
@@
-82,6
+78,7
@@
COPY --from=INSTALL /usr/bin/mysqladmin /usr/bin/
COPY --from=INSTALL /usr/bin/mysqlshow /usr/bin/
COPY --from=INSTALL /usr/lib/x86_64-linux-gnu/libedit.so.2 /usr/lib/x86_64-linux-gnu/
COPY --from=INSTALL /usr/lib/x86_64-linux-gnu/libbsd.so.0 /usr/lib/x86_64-linux-gnu/
COPY --from=INSTALL /usr/bin/mysqlshow /usr/bin/
COPY --from=INSTALL /usr/lib/x86_64-linux-gnu/libedit.so.2 /usr/lib/x86_64-linux-gnu/
COPY --from=INSTALL /usr/lib/x86_64-linux-gnu/libbsd.so.0 /usr/lib/x86_64-linux-gnu/
+COPY --from=INSTALL /usr/lib/x86_64-linux-gnu/libmd.so.0 /usr/lib/x86_64-linux-gnu/
COPY scripts/ /app/osm_pol/scripts/
COPY scripts/ /app/osm_pol/scripts/