Skip to content

Commit 93b2e6b

Browse files
committed
Found some more binary downloads that can be proxied
Signed-off-by: Roland Asmann <[email protected]>
1 parent e1b5c1b commit 93b2e6b

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

.github/workflows/image-build.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ env:
2121
NEXUS_ALPINE_REPO_PATH: /repository/alpine
2222
NEXUS_COMPOSER_PATH: /repository/composer
2323
NEXUS_DEBIAN_REPO_PATH: /repository/debian
24+
NEXUS_DOTNETCLI_PATH: /repository/dotnetcli
2425
NEXUS_GITHUB_PATH: /repository/github
26+
NEXUS_GOOGLE_PATH: /repository/google
2527
NEXUS_NODEJS_PATH: /repository/nodejs
2628
NEXUS_NPM_REPO_PATH: /repository/npm
2729
NEXUS_NUGET_REPO_PATH: /repository/nuget
@@ -86,7 +88,9 @@ jobs:
8688
"ALPINE_REPO=http://$NEXUS_SERVER:$NEXUS_PORT$NEXUS_ALPINE_REPO_PATH"
8789
"COMPOSER_URL=http://$NEXUS_SERVER:$NEXUS_PORT$NEXUS_COMPOSER_PATH"
8890
"DEBIAN_REPO=http://$NEXUS_SERVER:$NEXUS_PORT$NEXUS_DEBIAN_REPO_PATH"
91+
"DOTNETCLI_URL=http://$NEXUS_SERVER:$NEXUS_PORT$NEXUS_DOTNETCLI_PATH"
8992
"GITHUB_URL=http://$NEXUS_SERVER:$NEXUS_PORT$NEXUS_GITHUB_PATH"
93+
"GOOGLE_URL=http://$NEXUS_SERVER:$NEXUS_PORT$NEXUS_GOOGLE_PATH"
9094
"NODEJS_DIST_URL=http://$NEXUS_SERVER:$NEXUS_PORT$NEXUS_NODEJS_PATH/dist"
9195
"NPM_REPO=$NPM_REPO"
9296
"NUGET_REPO=http://$NEXUS_SERVER:$NEXUS_PORT$NEXUS_NUGET_REPO_PATH"

ci/images/Dockerfile.python311

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ FROM registry.suse.com/bci/python:3.11 AS base
44
ARG GCC_VERSION=14
55
ARG GITHUB_URL=https://github.com
66
ARG GO_VERSION=1.25.0
7+
ARG GOOGLE_URL=https://dl.google.com
78
ARG JAVA_VERSION=24.0.2-tem
89
ARG MAVEN_VERSION=3.9.11
910
# renovate: datasource=docker depName=node
@@ -90,7 +91,7 @@ RUN set -e; \
9091
&& sdk install java $JAVA_VERSION \
9192
&& sdk install maven $MAVEN_VERSION \
9293
&& mv /root/.sdkman/candidates/* /opt/ \
93-
&& curl -LO "https://dl.google.com/go/go${GO_VERSION}.linux-${GOBIN_VERSION}.tar.gz" \
94+
&& curl -LO "${GOOGLE_URL}/go/go${GO_VERSION}.linux-${GOBIN_VERSION}.tar.gz" \
9495
&& tar -C /usr/local -xzf go${GO_VERSION}.linux-${GOBIN_VERSION}.tar.gz \
9596
&& rm go${GO_VERSION}.linux-${GOBIN_VERSION}.tar.gz \
9697
&& go telemetry off \

ci/images/opensuse/Dockerfile.python310

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM registry.opensuse.org/opensuse/bci/python:3.10 AS base
33

44
ARG GITHUB_URL=https://github.com
55
ARG GO_VERSION=1.25.0
6+
ARG GOOGLE_URL=https://dl.google.com
67
ARG NODEJS_DIST_URL
78
ARG NPM_REPO
89
ARG OPENSUSE_CODECS_REPO
@@ -98,7 +99,7 @@ RUN set -e; \
9899
pipenv \
99100
poetry \
100101
uv \
101-
&& curl -LO "https://dl.google.com/go/go${GO_VERSION}.linux-${GOBIN_VERSION}.tar.gz" \
102+
&& curl -LO "$GOOGLE_URL/go/go${GO_VERSION}.linux-${GOBIN_VERSION}.tar.gz" \
102103
&& tar -C /usr/local -xzf go${GO_VERSION}.linux-${GOBIN_VERSION}.tar.gz \
103104
&& rm go${GO_VERSION}.linux-${GOBIN_VERSION}.tar.gz \
104105
&& go telemetry off \

ci/images/opensuse/Dockerfile.rolling

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
FROM opensuse/tumbleweed:latest AS base
33

44
ARG DOTNET_SDK_VERSION=9.0.100
5+
ARG DOTNETCLI_URL=https://dotnetcli.azureedge.net
56
ARG GITHUB_URL=https://github.com
67
ARG GRADLE_VERSION=8.14.3
78
ARG MAVEN_VERSION=4.0.0-rc-3
@@ -118,7 +119,7 @@ RUN set -e; \
118119
&& mv /root/.sdkman/candidates/* /opt/ \
119120
&& rm -rf /root/.sdkman \
120121
&& curl -L --output dotnet.tar.gz \
121-
https://dotnetcli.azureedge.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-${OS_ARCH_SUFFIX}.tar.gz \
122+
$DOTNETCLI_URL/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-${OS_ARCH_SUFFIX}.tar.gz \
122123
&& mkdir -p /usr/share/dotnet \
123124
&& tar -xf dotnet.tar.gz -C /usr/share/dotnet \
124125
&& rm dotnet.tar.gz \

0 commit comments

Comments
 (0)