8000 fix CI/CD failures New curl static changed from moparisthebest/static-curl to stunnel/static-curl by Slach · Pull Request #1865 · Altinity/clickhouse-operator · GitHub
[go: up one dir, main page]

Skip to content
8000
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
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,7 @@ tests/image/cache
/.devspace

# agents
.aider*
.aider*
CLAUDE.md
AGENTS.md
.claude
9 changes: 6 additions & 3 deletions dockerfile/metrics-exporter/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,12 @@ RUN wget -O /usr/bin/yq --progress=bar:force:noscroll "https://github.com/mikefa
RUN PLATFORM="x86_64" && if [ "${TARGETARCH}" = "arm64" ]; then PLATFORM="aarch64"; fi && \
wget -O /tmp/bash --progress=bar:force:noscroll "https://github.com/robxu9/bash-static/releases/latest/download/bash-linux-${PLATFORM}" && \
chmod +x /tmp/bash
RUN PLATFORM="amd64" && if [ "${TARGETARCH}" = "arm64" ]; then PLATFORM="aarch64"; fi && \
wget -O /tmp/curl --progress=bar:force:noscroll "https://github.com/moparisthebest/static-curl/releases/latest/download/curl-${PLATFORM}" && \
chmod +x /tmp/curl
RUN PLATFORM="x86_64" && if [ "${TARGETARCH}" = "arm64" ]; then PLATFORM="aarch64"; fi && \
CURL_VERSION=$(wget -qO- https://github.com/stunnel/static-curl/releases/latest 2>&1 | grep -oE 'tag/[0-9.]+' | head -n1 | cut -d'/' -f2) && \
wget -O /tmp/curl.tar.xz --progress=bar:force:noscroll "https://github.com/stunnel/static-curl/releases/download/${CURL_VERSION}/curl-linux-${PLATFORM}-glibc-${CURL_VERSION}.tar.xz" && \
tar -xf /tmp/curl.tar.xz -C /tmp/ && \
chmod +x /tmp/curl && \
rm -f /tmp/curl.tar.xz

# Reconstruct source tree inside docker
WORKDIR /clickhouse-operator
Expand Down
9 changes: 6 additions & 3 deletions dockerfile/operator/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,12 @@ RUN wget -O /usr/bin/yq --progress=bar:force:noscroll "https://github.com/mikefa
RUN PLATFORM="x86_64" && if [ "${TARGETARCH}" = "arm64" ]; then PLATFORM="aarch64"; fi && \
wget -O /tmp/bash --progress=bar:force:noscroll "https://github.com/robxu9/bash-static/releases/latest/download/bash-linux-${PLATFORM}" && \
chmod +x /tmp/bash
RUN PLATFORM="amd64" && if [ "${TARGETARCH}" = "arm64" ]; then PLATFORM="aarch64"; fi && \
wget -O /tmp/curl --progress=bar:force:noscroll "https://github.com/moparisthebest/static-curl/releases/latest/download/curl-${PLATFORM}" && \
chmod +x /tmp/curl
RUN PLATFORM="x86_64" && if [ "${TARGETARCH}" = "arm64" ]; then PLATFORM="aarch64"; fi && \
CURL_VERSION=$(wget -qO- https://github.com/stunnel/static-curl/releases/latest 2>&1 | grep -oE 'tag/[0-9.]+' | head -n1 | cut -d'/' -f2) && \
wget -O /tmp/curl.tar.xz --progress=bar:force:noscroll "https://github.com/stunnel/static-curl/releases/download/${CURL_VERSION}/curl-linux-${PLATFORM}-glibc-${CURL_VERSION}.tar.xz" && \
tar -xf /tmp/curl.tar.xz -C /tmp/ && \
chmod +x /tmp/curl && \
rm -f /tmp/curl.tar.xz

# Reconstruct source tree inside docker
WORKDIR /clickhouse-operator
Expand Down
< 4283 span data-view-component="true"> Loading
0