Skip to content

Commit 2d643dc

Browse files
CyclenerdCyclenerd
committed
gcr-cleaner removed
1 parent b06ef30 commit 2d643dc

5 files changed

Lines changed: 3 additions & 32 deletions

File tree

‎Dockerfile‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ ENV LANG="C.UTF-8" \
3737
CLOUDSDK_PYTHON="/usr/bin/python3" \
3838
# https://github.com/sgarciac/fuego/releases
3939
FUEGO_VERSION="0.35.0" \
40-
# https://github.com/GoogleCloudPlatform/gcr-cleaner/releases
41-
GCR_CLEANER_VERSION="0.12.2" \
4240
# https://github.com/golangci/golangci-lint/releases
4341
GOLANGCI_LINT_VERSION="2.10.1" \
4442
# https://github.com/terraform-docs/terraform-docs/releases
@@ -53,7 +51,6 @@ FROM base AS amd64
5351
ENV AWS_CLI_URL="https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" \
5452
FUEGO_URL="https://github.com/sgarciac/fuego/archive/refs/tags/${FUEGO_VERSION}.tar.gz" \
5553
GCLOUD_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-linux-x86_64.tar.gz" \
56-
GCR_CLEANER_URL="https://github.com/GoogleCloudPlatform/gcr-cleaner/releases/download/v${GCR_CLEANER_VERSION}/gcr-cleaner-cli_${GCR_CLEANER_VERSION}_linux_amd64.tar.gz" \
5754
GOLANGCI_LINT_URL="https://github.com/golangci/golangci-lint/releases/download/v${GOLANGCI_LINT_VERSION}/golangci-lint-${GOLANGCI_LINT_VERSION}-linux-amd64.tar.gz" \
5855
HCLOUD_URL="https://github.com/hetznercloud/cli/releases/latest/download/hcloud-linux-amd64.tar.gz" \
5956
OPA_URL="https://github.com/open-policy-agent/opa/releases/latest/download/opa_linux_amd64_static" \
@@ -68,7 +65,6 @@ FROM base AS arm64
6865
ENV AWS_CLI_URL="https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip" \
6966
FUEGO_URL="https://github.com/sgarciac/fuego/archive/refs/tags/${FUEGO_VERSION}.tar.gz" \
7067
GCLOUD_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-linux-arm.tar.gz" \
71-
GCR_CLEANER_URL="https://github.com/GoogleCloudPlatform/gcr-cleaner/releases/download/v${GCR_CLEANER_VERSION}/gcr-cleaner-cli_${GCR_CLEANER_VERSION}_linux_arm64.tar.gz" \
7268
GOLANGCI_LINT_URL="https://github.com/golangci/golangci-lint/releases/download/v${GOLANGCI_LINT_VERSION}/golangci-lint-${GOLANGCI_LINT_VERSION}-linux-arm64.tar.gz" \
7369
HCLOUD_URL="https://github.com/hetznercloud/cli/releases/latest/download/hcloud-linux-arm64.tar.gz" \
7470
OPA_URL="https://github.com/open-policy-agent/opa/releases/latest/download/opa_linux_arm64_static" \
@@ -137,7 +133,7 @@ RUN uname -m && \
137133
pip3 install ansible && \
138134
pip3 install ansible-core && \
139135
pip3 install ansible-lint && \
140-
# AWS CLI (https://github.com/GoogleCloudPlatform/gcr-cleaner)
136+
# AWS CLI ()
141137
echo "AWS CLI URL: '$AWS_CLI_URL'" && \
142138
curl -L "$AWS_CLI_URL" -o "awscliv2.zip" && \
143139
unzip -qq "awscliv2.zip" && \
@@ -173,11 +169,6 @@ RUN uname -m && \
173169
ln -s "/usr/bin/google-cloud-sdk/bin/gcloud-crc32c" "/usr/bin/gcloud-crc32c" && \
174170
ln -s "/usr/bin/google-cloud-sdk/bin/git-credential-gcloud.sh" "/usr/bin/git-credential-gcloud.sh" && \
175171
ln -s "/usr/bin/google-cloud-sdk/bin/gsutil" "/usr/bin/gsutil" && \
176-
# GCR Cleaner (https://github.com/GoogleCloudPlatform/gcr-cleaner)
177-
echo "GCR Cleaner URL: '$GCR_CLEANER_URL'" && \
178-
curl -L "$GCR_CLEANER_URL" -o "gcr-cleaner-cli.tar.gz" && \
179-
tar -C "/usr/bin/" -xf "gcr-cleaner-cli.tar.gz" "gcr-cleaner-cli" && \
180-
rm "gcr-cleaner-cli.tar.gz" && \
181172
# golangci-lint (https://golangci-lint.run/)
182173
echo "golangci-lint URL: '$GOLANGCI_LINT_URL'" && \
183174
curl -L "$GOLANGCI_LINT_URL" -o "golangci-lint.tar.gz" && \
@@ -247,7 +238,6 @@ RUN uname -m && \
247238
flake8 --version && \
248239
fuego --version && \
249240
gcloud --version && \
250-
gcr-cleaner-cli -version && \
251241
golangci-lint --version && \
252242
git --version && \
253243
go version && \

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ The following software is included and tested:
5555
* [AWS](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-welcome.html) command line interface (CLI) tools (`aws`)
5656
* [fuego](https://github.com/sgarciac/fuego#readme) command line firestore client (`fuego`)
5757
* [Hetzner Cloud CLI](https://github.com/hetznercloud/cli) (`hcloud`)
58-
* [GCR Cleaner](https://github.com/GoogleCloudPlatform/gcr-cleaner#readme) deletes old container images on registries (`gcr-cleaner-cli`)
5958
* [Google Cloud](https://cloud.google.com/cli) command line interface (CLI) tools (`gcloud`, `gsutil` and `bq`)
6059
* [Open Policy Agent](https://www.openpolicyagent.org/) general-purpose policy engine, context-aware policy enforcement (`opa`)
6160
* [Packer](https://developer.hashicorp.com/packer) (`packer`)

‎devcontainer/Dockerfile‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ ENV LANG="C.UTF-8" \
3131
CLOUDSDK_PYTHON="/usr/bin/python3" \
3232
# https://github.com/sgarciac/fuego/releases
3333
FUEGO_VERSION="0.35.0" \
34-
# https://github.com/GoogleCloudPlatform/gcr-cleaner/releases
35-
GCR_CLEANER_VERSION="0.12.2" \
3634
# https://github.com/golangci/golangci-lint/releases
3735
GOLANGCI_LINT_VERSION="2.10.1" \
3836
# https://github.com/terraform-docs/terraform-docs/releases
@@ -47,7 +45,6 @@ FROM base AS amd64
4745
ENV AWS_CLI_URL="https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" \
4846
FUEGO_URL="https://github.com/sgarciac/fuego/archive/refs/tags/${FUEGO_VERSION}.tar.gz" \
4947
GCLOUD_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-linux-x86_64.tar.gz" \
50-
GCR_CLEANER_URL="https://github.com/GoogleCloudPlatform/gcr-cleaner/releases/download/v${GCR_CLEANER_VERSION}/gcr-cleaner-cli_${GCR_CLEANER_VERSION}_linux_amd64.tar.gz" \
5148
GOLANGCI_LINT_URL="https://github.com/golangci/golangci-lint/releases/download/v${GOLANGCI_LINT_VERSION}/golangci-lint-${GOLANGCI_LINT_VERSION}-linux-amd64.tar.gz" \
5249
HCLOUD_URL="https://github.com/hetznercloud/cli/releases/latest/download/hcloud-linux-amd64.tar.gz" \
5350
K9S_URL="https://github.com/derailed/k9s/releases/latest/download/k9s_linux_amd64.deb" \
@@ -63,7 +60,6 @@ FROM base AS arm64
6360
ENV AWS_CLI_URL="https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip" \
6461
FUEGO_URL="https://github.com/sgarciac/fuego/archive/refs/tags/${FUEGO_VERSION}.tar.gz" \
6562
GCLOUD_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-linux-arm.tar.gz" \
66-
GCR_CLEANER_URL="https://github.com/GoogleCloudPlatform/gcr-cleaner/releases/download/v${GCR_CLEANER_VERSION}/gcr-cleaner-cli_${GCR_CLEANER_VERSION}_linux_arm64.tar.gz" \
6763
GOLANGCI_LINT_URL="https://github.com/golangci/golangci-lint/releases/download/v${GOLANGCI_LINT_VERSION}/golangci-lint-${GOLANGCI_LINT_VERSION}-linux-arm64.tar.gz" \
6864
HCLOUD_URL="https://github.com/hetznercloud/cli/releases/latest/download/hcloud-linux-arm64.tar.gz" \
6965
K9S_URL="https://github.com/derailed/k9s/releases/latest/download/k9s_linux_arm64.deb" \
@@ -149,7 +145,7 @@ RUN uname -m && \
149145
pip3 install ansible && \
150146
pip3 install ansible-core && \
151147
pip3 install ansible-lint && \
152-
# AWS CLI (https://github.com/GoogleCloudPlatform/gcr-cleaner)
148+
# AWS CLI (https://aws.amazon.com/cli/)
153149
echo "AWS CLI URL: '$AWS_CLI_URL'" && \
154150
curl -L "$AWS_CLI_URL" -o "awscliv2.zip" && \
155151
unzip -qq "awscliv2.zip" && \
@@ -175,10 +171,6 @@ RUN uname -m && \
175171
rm -rf "/usr/bin/google-cloud-sdkgoogle-cloud-sdk/.install"; \
176172
fi && \
177173
gcloud components install -q "gke-gcloud-auth-plugin" && \
178-
# GCR Cleaner (https://github.com/GoogleCloudPlatform/gcr-cleaner)
179-
curl -L "$GCR_CLEANER_URL" -o "gcr-cleaner-cli.tar.gz" && \
180-
tar -C "/usr/bin/" -xf "gcr-cleaner-cli.tar.gz" "gcr-cleaner-cli" && \
181-
rm "gcr-cleaner-cli.tar.gz" && \
182174
# golangci-lint (https://golangci-lint.run/)
183175
echo "golangci-lint URL: '$GOLANGCI_LINT_URL'" && \
184176
curl -L "$GOLANGCI_LINT_URL" -o "golangci-lint.tar.gz" && \
@@ -251,7 +243,6 @@ RUN uname -m && \
251243
flake8 --version && \
252244
fuego --version && \
253245
gcloud --version && \
254-
gcr-cleaner-cli -version && \
255246
golangci-lint --version && \
256247
git --version && \
257248
go version && \

‎test.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ MY_COMMANDS=(
1515
"flake8 --version"
1616
"fuego --version"
1717
"gcloud --version"
18-
"gcr-cleaner-cli -version"
1918
"golangci-lint --version"
2019
"git --version"
2120
"go version"

‎workstations/Dockerfile‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ ENV LANG="C.UTF-8" \
2222
NONINTERACTIVE=1 \
2323
# https://github.com/sgarciac/fuego/releases
2424
FUEGO_VERSION="0.35.0" \
25-
# https://github.com/GoogleCloudPlatform/gcr-cleaner/releases
26-
GCR_CLEANER_VERSION="0.12.2" \
2725
# https://github.com/golangci/golangci-lint/releases
2826
GOLANGCI_LINT_VERSION="2.10.1" \
2927
# https://github.com/terraform-docs/terraform-docs/releases
@@ -44,7 +42,6 @@ ENV LANG="C.UTF-8" \
4442
# Download URLs for AMD64 (X86/64)
4543
ENV AWS_CLI_URL="https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" \
4644
FUEGO_URL="https://github.com/sgarciac/fuego/archive/refs/tags/${FUEGO_VERSION}.tar.gz" \
47-
GCR_CLEANER_URL="https://github.com/GoogleCloudPlatform/gcr-cleaner/releases/download/v${GCR_CLEANER_VERSION}/gcr-cleaner-cli_${GCR_CLEANER_VERSION}_linux_amd64.tar.gz" \
4845
GOLANGCI_LINT_URL="https://github.com/golangci/golangci-lint/releases/download/v${GOLANGCI_LINT_VERSION}/golangci-lint-${GOLANGCI_LINT_VERSION}-linux-amd64.tar.gz" \
4946
HCLOUD_URL="https://github.com/hetznercloud/cli/releases/latest/download/hcloud-linux-amd64.tar.gz" \
5047
K9S_URL="https://github.com/derailed/k9s/releases/latest/download/k9s_linux_amd64.deb" \
@@ -127,7 +124,7 @@ RUN uname -m && \
127124
pip3 install ansible && \
128125
pip3 install ansible-core && \
129126
pip3 install ansible-lint && \
130-
# AWS CLI (https://github.com/GoogleCloudPlatform/gcr-cleaner)
127+
# AWS CLI (https://aws.amazon.com/cli/)
131128
echo "AWS CLI URL: '$AWS_CLI_URL'" && \
132129
curl -L "$AWS_CLI_URL" -o "awscliv2.zip" && \
133130
unzip -qq "awscliv2.zip" && \
@@ -141,10 +138,6 @@ RUN uname -m && \
141138
mv "fuego" "/usr/bin/fuego" && \
142139
cd "../" && \
143140
rm -rf fuego* && \
144-
# GCR Cleaner (https://github.com/GoogleCloudPlatform/gcr-cleaner)
145-
curl -L "$GCR_CLEANER_URL" -o "gcr-cleaner-cli.tar.gz" && \
146-
tar -C "/usr/bin/" -xf "gcr-cleaner-cli.tar.gz" "gcr-cleaner-cli" && \
147-
rm "gcr-cleaner-cli.tar.gz" && \
148141
# golangci-lint (https://golangci-lint.run/)
149142
echo "golangci-lint URL: '$GOLANGCI_LINT_URL'" && \
150143
curl -L "$GOLANGCI_LINT_URL" -o "golangci-lint.tar.gz" && \
@@ -237,7 +230,6 @@ RUN uname -m && \
237230
flake8 --version && \
238231
fuego --version && \
239232
gcloud --version && \
240-
gcr-cleaner-cli -version && \
241233
golangci-lint --version && \
242234
git --version && \
243235
go version && \

0 commit comments

Comments
 (0)