projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename alertmanager vdu-webhook endpoint from alert_vdu to vdu_down
[osm/devops.git]
/
docker
/
POL
/
Dockerfile
diff --git
a/docker/POL/Dockerfile
b/docker/POL/Dockerfile
index
b807bfd
..
8ed8f5e
100644
(file)
--- a/
docker/POL/Dockerfile
+++ b/
docker/POL/Dockerfile
@@
-15,7
+15,7
@@
# limitations under the License.
#######################################################################################
# limitations under the License.
#######################################################################################
-FROM ubuntu:2
0
.04 as INSTALL
+FROM ubuntu:2
2
.04 as INSTALL
ARG APT_PROXY
RUN if [ ! -z $APT_PROXY ] ; then \
ARG APT_PROXY
RUN if [ ! -z $APT_PROXY ] ; then \
@@
-25,12
+25,15
@@
RUN if [ ! -z $APT_PROXY ] ; then \
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 \
- gcc=4:9.3.* \
- python3=3.8.* \
- python3-dev=3.8.* \
- python3-pip=20.0.2* \
- python3-setuptools=45.2.* \
- curl=7.68.*
+ gcc=4:11.* \
+ python3=3.10.* \
+ python3-dev=3.10.* \
+ python3-pip=22.0.* \
+ curl=7.81.* \
+ && rm -rf /var/lib/apt/lists/*
+
+#######################################################################################
+# End of common prepration
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 \
@@
-50,7
+53,7
@@
RUN pip3 install \
-r /usr/lib/python3/dist-packages/osm_policy_module/requirements.txt
#######################################################################################
-r /usr/lib/python3/dist-packages/osm_policy_module/requirements.txt
#######################################################################################
-FROM ubuntu:2
0
.04 as FINAL
+FROM ubuntu:2
2
.04 as FINAL
ARG APT_PROXY
RUN if [ ! -z $APT_PROXY ] ; then \
ARG APT_PROXY
RUN if [ ! -z $APT_PROXY ] ; then \
@@
-60,13
+63,15
@@
RUN if [ ! -z $APT_PROXY ] ; then \
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 \
- python3-minimal=3.
8
.* \
+ python3-minimal=3.
10
.* \
&& rm -rf /var/lib/apt/lists/*
&& 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/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/local/lib/python3.10/dist-packages /usr/local/lib/python3.10/dist-packages
+
+#######################################################################################
+# End of common prepration
+
COPY --from=INSTALL /usr/bin/osm* /usr/bin/
COPY --from=INSTALL /usr/bin/mysql /usr/bin/
COPY --from=INSTALL /usr/bin/mysqladmin /usr/bin/
COPY --from=INSTALL /usr/bin/osm* /usr/bin/
COPY --from=INSTALL /usr/bin/mysql /usr/bin/
COPY --from=INSTALL /usr/bin/mysqladmin /usr/bin/
@@
-102,6
+107,10
@@
ENV OSMPOL_SQL_DATABASE_URI sqlite:///mon_sqlite.db
ENV OSMPOL_GLOBAL_LOG_LEVEL INFO
ENV OSMPOL_GLOBAL_LOG_LEVEL INFO
+ENV OSMPOL_AUTOHEAL_ENABLED True
+
+ENV OSMPOL_AUTOSCALE_ENABLED True
+
HEALTHCHECK --start-period=120s --interval=10s --timeout=5s --retries=5 \
CMD osm-pol-healthcheck || exit 1
HEALTHCHECK --start-period=120s --interval=10s --timeout=5s --retries=5 \
CMD osm-pol-healthcheck || exit 1