diff --git a/backup-daemon/docker/Dockerfile b/backup-daemon/docker/Dockerfile index b40a6c4..dd55679 100644 --- a/backup-daemon/docker/Dockerfile +++ b/backup-daemon/docker/Dockerfile @@ -5,6 +5,9 @@ ENV ZOOKEEPER_HOME=/opt/zookeeper \ ENV PYTHONPATH=/usr/local/lib/python3.7/site-packages/integration_library_builtIn +RUN echo "https://dl-cdn.alpinelinux.org/alpine/v3.23/main" > /etc/apk/repositories && \ + echo "https://dl-cdn.alpinelinux.org/alpine/v3.23/community" >> /etc/apk/repositories + COPY backup-daemon.conf /etc/backup-daemon.conf COPY docker/requirements.txt ${ZOOKEEPER_HOME}/requirements.txt COPY scripts/ ${ZOOKEEPER_HOME}/scripts/ @@ -19,6 +22,12 @@ RUN set -x \ # Upgrade all tools to avoid vulnerabilities RUN set -x && apk upgrade --available +# Upgrade tools from edge to avoid vulnerabilities +RUN echo "https://dl-cdn.alpinelinux.org/alpine/edge/main" > /etc/apk/repositories \ + && echo "https://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ + && apk add --update --no-cache --upgrade \ + pcre2 curl gnutls libcurl jq + RUN chmod +x ${ZOOKEEPER_HOME}/scripts/*.py RUN chmod +x ${ZOOKEEPER_HOME}/sh_scripts/list_instances_in_vault_command.sh diff --git a/docker-zookeeper/docker/Dockerfile b/docker-zookeeper/docker/Dockerfile index 80225f9..46e217c 100644 --- a/docker-zookeeper/docker/Dockerfile +++ b/docker-zookeeper/docker/Dockerfile @@ -159,7 +159,7 @@ RUN set -x && apk upgrade --available RUN echo "https://dl-cdn.alpinelinux.org/alpine/edge/main" > /etc/apk/repositories \ && echo "https://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ && apk add --update --no-cache --upgrade \ - pcre2 + pcre2 curl gnutls libcurl jq USER 1000:0 WORKDIR ${ZOOKEEPER_HOME} diff --git a/integration-tests/docker/Dockerfile b/integration-tests/docker/Dockerfile index 9812b8d..3119bb1 100644 --- a/integration-tests/docker/Dockerfile +++ b/integration-tests/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/netcracker/qubership-docker-integration-tests:main +FROM ghcr.io/netcracker/qubership-docker-integration-tests:0.1.19 ENV ROBOT_OUTPUT=${ROBOT_HOME}/output \ DISTR_DIR=/tmp/deps \ @@ -8,6 +8,9 @@ ENV ROBOT_OUTPUT=${ROBOT_HOME}/output \ RUN mkdir -p ${ROBOT_HOME} \ && mkdir -p ${ROBOT_OUTPUT} +RUN echo "https://dl-cdn.alpinelinux.org/alpine/v3.23/main" > /etc/apk/repositories && \ + echo "https://dl-cdn.alpinelinux.org/alpine/v3.23/community" >> /etc/apk/repositories + COPY docker/requirements.txt ${ROBOT_HOME}/requirements.txt COPY docker/zookeeper_pods_checker.py ${ROBOT_HOME}/zookeeper_pods_checker.py COPY robot ${ROBOT_HOME} diff --git a/monitoring/docker/Dockerfile b/monitoring/docker/Dockerfile index 2555722..feedd87 100644 --- a/monitoring/docker/Dockerfile +++ b/monitoring/docker/Dockerfile @@ -2,6 +2,9 @@ FROM telegraf:1.37-alpine ENV ZOOKEEPER_MONITORING_HOME=/opt/zookeeper-monitoring +RUN echo "https://dl-cdn.alpinelinux.org/alpine/v3.23/main" > /etc/apk/repositories && \ + echo "https://dl-cdn.alpinelinux.org/alpine/v3.23/community" >> /etc/apk/repositories + RUN mkdir -p ${ZOOKEEPER_MONITORING_HOME} COPY docker/config/requirements.txt ${ZOOKEEPER_MONITORING_HOME}/requirements.txt @@ -27,6 +30,12 @@ RUN python3 -m ensurepip \ # Upgrade all tools to avoid vulnerabilities RUN set -x && apk upgrade --available +# Upgrade tools from edge to avoid vulnerabilities +RUN echo "https://dl-cdn.alpinelinux.org/alpine/edge/main" > /etc/apk/repositories \ + && echo "https://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ + && apk add --update --no-cache --upgrade \ + pcre2 curl gnutls libcurl jq + USER 1000:0 WORKDIR ${ZOOKEEPER_MONITORING_HOME}