Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions backup-daemon/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion docker-zookeeper/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM golang:1.25-alpine3.23 as builder

Check warning on line 1 in docker-zookeeper/docker/Dockerfile

View workflow job for this annotation

GitHub Actions / qubership-docker-zookeeper Image Build

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/
ARG BUILDPLATFORM
ARG TARGETOS
ARG TARGETARCH
Expand Down Expand Up @@ -33,7 +33,7 @@
ZOOKEEPER_BACKUP_PORT=8081

WORKDIR /
COPY --from=builder --chown=${USER_UID} /workspace/zookeeper-assistant .

Check warning on line 36 in docker-zookeeper/docker/Dockerfile

View workflow job for this annotation

GitHub Actions / qubership-docker-zookeeper Image Build

Variables should be defined before their use

UndefinedVar: Usage of undefined variable '$USER_UID' More info: https://docs.docker.com/go/dockerfile/rule/undefined-var/

# Install misc tools
RUN set -x \
Expand Down Expand Up @@ -159,7 +159,7 @@
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}
Expand Down
5 changes: 4 additions & 1 deletion integration-tests/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -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}
Expand Down
9 changes: 9 additions & 0 deletions monitoring/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}

Expand Down
Loading