diff --git a/.github/workflows/bump-test-workflows-version.yaml b/.github/workflows/bump-test-workflows-version.yaml index 0c831156..498c36c0 100644 --- a/.github/workflows/bump-test-workflows-version.yaml +++ b/.github/workflows/bump-test-workflows-version.yaml @@ -22,7 +22,7 @@ jobs: with: ref: main persist-credentials: true - token: ${{ secrets.GH_ACCESS_TOKEN }} + token: ${{ github.token }} - name: Update version env: GH_TOKEN: ${{ github.token }} diff --git a/.github/workflows/cleanup-old-docker-container.yaml b/.github/workflows/cleanup-old-docker-container.yaml index 9dfd96bb..5e369e51 100644 --- a/.github/workflows/cleanup-old-docker-container.yaml +++ b/.github/workflows/cleanup-old-docker-container.yaml @@ -64,4 +64,4 @@ jobs: dry-run: ${{ env.DRY_RUN }} debug: ${{ env.DEBUG }} env: - PACKAGE_TOKEN: ${{ secrets.GH_RWD_PACKAGE_TOKEN }} + PACKAGE_TOKEN: ${{ github.token }} diff --git a/curator/docker/backup-docker/Dockerfile b/curator/docker/backup-docker/Dockerfile index 2d9722e1..c97ce373 100644 --- a/curator/docker/backup-docker/Dockerfile +++ b/curator/docker/backup-docker/Dockerfile @@ -16,7 +16,7 @@ RUN go mod download COPY curator/docker/backup-docker/indices_migration_tool/main.go main.go RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} GO111MODULE=on go build -a -o migration_tool main.go -FROM ghcr.io/netcracker/qubership-backup-daemon-go:main +FROM ghcr.io/netcracker/qubership-backup-daemon-go:0.1.14 ARG TARGETOS ARG TARGETARCH @@ -76,7 +76,7 @@ RUN chmod +x ${ELASTICSEARCH_CURATOR_HOME}/* 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 --upgrade --no-cache \ - pcre2 libcurl curl + pcre2 libcurl curl py3-setuptools py3-setuptools-pyc musl-utils USER 1000:0 diff --git a/curator/opensearch_indices_cleaner/docker/Dockerfile b/curator/opensearch_indices_cleaner/docker/Dockerfile index 8fe2e9cd..d43820f6 100644 --- a/curator/opensearch_indices_cleaner/docker/Dockerfile +++ b/curator/opensearch_indices_cleaner/docker/Dockerfile @@ -10,7 +10,7 @@ COPY scripts/indices_cleaner_tests.py ${ELASTICSEARCH_INDICES_CLEANER_HOME}/indi # Return back 5.8.1 version for 'elasticsearch-curator' in requirements when 'botocore' version is compatible with 5.8.1 version of 'elasticsearch-curator' RUN set -x \ && apk add --upgrade --no-cache build-base apk-tools \ - && pip3 install --upgrade pip setuptools \ + && pip3 install --upgrade pip setuptools==80.10.2 jaraco.context==6.1.0 \ && pip3 install -r ${ELASTICSEARCH_INDICES_CLEANER_HOME}/requirements.txt \ && pip3 install --upgrade urllib3 \ && rm -rf /var/cache/apk/* @@ -18,6 +18,12 @@ RUN set -x \ # Upgrade all tools to avoid vulnerabilities RUN set -x && apk upgrade --no-cache --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 --upgrade --no-cache \ + libcrypto3 libssl3 binutils zlib + RUN set -x \ && python3 -m unittest discover -s ${ELASTICSEARCH_INDICES_CLEANER_HOME} -p "*_tests.py" diff --git a/integration-tests/docker/Dockerfile b/integration-tests/docker/Dockerfile index 61103b72..cdb88dc5 100644 --- a/integration-tests/docker/Dockerfile +++ b/integration-tests/docker/Dockerfile @@ -17,6 +17,7 @@ COPY robot ${ROBOT_HOME} RUN chmod -R 775 ${ROBOT_HOME}/tests/opensearch/ha/test-data-resources/* RUN set -x \ + && pip install --no-cache-dir --upgrade pip==26.0 \ && pip3 install -r ${ROBOT_HOME}/requirements.txt \ && apk add --no-cache curl \ && rm -rf /var/cache/apk/* @@ -24,7 +25,7 @@ RUN set -x \ 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 --upgrade --no-cache \ - libcurl curl + libcurl curl libcrypto3 musl-dev musl-utils musl libssl3 libuuid binutils vim xxd vim-common RUN set -x && apk add --update --no-cache apk-tools && apk upgrade --no-cache --available diff --git a/integration-tests/docker/requirements.txt b/integration-tests/docker/requirements.txt index 7ea9f858..86eab84d 100644 --- a/integration-tests/docker/requirements.txt +++ b/integration-tests/docker/requirements.txt @@ -1,3 +1,6 @@ robotframework-requests==0.9.7 python-dateutil==2.9.0 jsonpath==0.82.2 +urllib3==2.6.3 +cryptography==46.0.7 +requests==2.32.0 diff --git a/monitoring/docker/Dockerfile b/monitoring/docker/Dockerfile index 8d48ce73..dc53abe7 100644 --- a/monitoring/docker/Dockerfile +++ b/monitoring/docker/Dockerfile @@ -19,6 +19,14 @@ RUN set -x \ # Upgrade all tools to avoid vulnerabilities RUN set -x && apk upgrade --no-cache --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 --upgrade --no-cache \ + net-snmp-tools net-snmp-libs net-snmp-agent-libs musl musl-utils libcrypto3 libssl3 \ + setpriv libcap-utils libcap2 libcap-getcap libcap libexpat zlib iputils-arping iputils-clockdiff \ + iputils iputils-ping iputils-tracepath openssl + RUN rm /usr/lib/python3.12/EXTERNALLY-MANAGED # Install misc tools diff --git a/monitoring/docker/config/requirements.txt b/monitoring/docker/config/requirements.txt index 62b3fd53..f017a4f0 100644 --- a/monitoring/docker/config/requirements.txt +++ b/monitoring/docker/config/requirements.txt @@ -1,2 +1,2 @@ requests==2.33.1 -kubernetes==21.7.0 \ No newline at end of file +kubernetes==21.7.0 diff --git a/operator/Dockerfile b/operator/Dockerfile index 72de8481..cbe4d752 100644 --- a/operator/Dockerfile +++ b/operator/Dockerfile @@ -47,7 +47,7 @@ RUN set -x && apk upgrade --no-cache --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 --upgrade --no-cache \ - pcre2 libcurl curl + pcre2 libcurl curl musl musl-utils libcrypto3 libssl3 zlib openssl RUN addgroup ${GROUP_NAME} && adduser -D -G ${GROUP_NAME} -u ${USER_UID} ${USER_NAME} USER ${USER_UID} diff --git a/tls-init/docker/Dockerfile b/tls-init/docker/Dockerfile index 1053464c..4cefc092 100644 --- a/tls-init/docker/Dockerfile +++ b/tls-init/docker/Dockerfile @@ -23,7 +23,7 @@ RUN set -x \ 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 --upgrade --no-cache \ - libcurl curl + libcurl curl musl musl-utils libcrypto3 libssl3 zlib openssl musl-dev WORKDIR ${OPENSEARCH_TLS_INIT_HOME}