Skip to content
Open
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
2 changes: 1 addition & 1 deletion .github/workflows/bump-test-workflows-version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cleanup-old-docker-container.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
4 changes: 2 additions & 2 deletions curator/docker/backup-docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM golang:1.26.3-alpine3.23 as builder

Check warning on line 1 in curator/docker/backup-docker/Dockerfile

View workflow job for this annotation

GitHub Actions / qubership-opensearch-curator 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/

Check warning on line 1 in curator/docker/backup-docker/Dockerfile

View workflow job for this annotation

GitHub Actions / qubership-opensearch-curator 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 All @@ -16,7 +16,7 @@
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
Expand All @@ -29,7 +29,7 @@
COPY curator/docker/backup-docker/config/curator.yml ${ELASTICSEARCH_CURATOR_HOME}/config/curator.yml
COPY curator/docker/backup-docker/actions ${ELASTICSEARCH_CURATOR_HOME}/actions
COPY curator/docker/backup-docker/docker-entrypoint.sh /docker-entrypoint.sh
COPY --from=builder --chown=${USER_UID} /workspace/curator/docker/backup-docker/indices_migration_tool/migration_tool ${ELASTICSEARCH_CURATOR_HOME}

Check warning on line 32 in curator/docker/backup-docker/Dockerfile

View workflow job for this annotation

GitHub Actions / qubership-opensearch-curator 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/

Check warning on line 32 in curator/docker/backup-docker/Dockerfile

View workflow job for this annotation

GitHub Actions / qubership-opensearch-curator 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/

RUN apk add --no-cache wget python3 python3-dev py3-pip \
&& apk update \
Expand Down Expand Up @@ -76,7 +76,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 --upgrade --no-cache \
pcre2 libcurl curl
pcre2 libcurl curl py3-setuptools py3-setuptools-pyc musl-utils

USER 1000:0

Expand Down
8 changes: 7 additions & 1 deletion curator/opensearch_indices_cleaner/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,20 @@ 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/*

# 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"

Expand Down
3 changes: 2 additions & 1 deletion integration-tests/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@ 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/*

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

Expand Down
3 changes: 3 additions & 0 deletions integration-tests/docker/requirements.txt
Original file line number Diff line number Diff line change
@@ -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
8 changes: 8 additions & 0 deletions monitoring/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion monitoring/docker/config/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
requests==2.33.1
kubernetes==21.7.0
kubernetes==21.7.0
2 changes: 1 addition & 1 deletion operator/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Build the manager binary
# Note: this uses host platform for the build, and we ask go build to target the needed platform, so we do not spend time on qemu emulation when running "go build"
FROM --platform=$BUILDPLATFORM golang:1.26.3-alpine3.23 as builder

Check warning on line 3 in operator/Dockerfile

View workflow job for this annotation

GitHub Actions / qubership-opensearch-operator 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 @@ -47,7 +47,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 --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}
Expand Down
2 changes: 1 addition & 1 deletion tls-init/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
Loading