Skip to content

Commit 7d65b92

Browse files
committed
Fix
1 parent e3b6968 commit 7d65b92

File tree

2 files changed

+4
-46
lines changed

2 files changed

+4
-46
lines changed

.circleci/config.yml

Lines changed: 3 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,13 @@ executors:
1010
docker:
1111
- image: cimg/go:1.26.0
1212

13-
# Machine executor: Docker and binfmt run on the VM host so armv7 builds work (QEMU).
14-
release-machine:
15-
machine:
16-
image: ubuntu-2004:current
17-
resource_class: large
18-
shell: /bin/bash
19-
2013
commands:
2114
install_goreleaser_dependencies:
2215
description: Register Docker platforms for multi-arch builds (arm64, armv7)
2316
steps:
2417
- run: docker run --privileged --rm tonistiigi/binfmt --install all
2518

2619
references:
27-
install_vault_ubuntu: &install_vault_ubuntu
28-
run:
29-
name: install hashicorp vault (Ubuntu)
30-
command: |
31-
sudo apt-get update -qq && sudo apt-get install -y -qq unzip curl
32-
curl -sLo /tmp/vault.zip https://releases.hashicorp.com/vault/1.12.2/vault_1.12.2_linux_amd64.zip
33-
echo "116c143de377a77a7ea455a367d5e9fe5290458e8a941a6e2dd85d92aaedba67 /tmp/vault.zip" | sha256sum -c -
34-
unzip -o /tmp/vault.zip -d /tmp && sudo mv /tmp/vault /usr/local/bin/vault
35-
vault version
3620
e2e_config: &e2e_config
3721
command_runner_image: quay.io/reactiveops/ci-images:v14-bullseye
3822
kind_node_image: "kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb"
@@ -98,33 +82,6 @@ jobs:
9882
- install_goreleaser_dependencies
9983
- run: echo 'export GORELEASER_CURRENT_TAG="${CIRCLE_TAG}"' >> $BASH_ENV
10084
- run: goreleaser
101-
102-
# Uses machine executor so Docker + binfmt run on same host; armv7 image builds succeed.
103-
release_machine:
104-
executor: release-machine
105-
working_directory: ~/pluto
106-
steps:
107-
- checkout
108-
- *install_vault_ubuntu
109-
- rok8s/get_vault_env:
110-
vault_path: repo/global/env
111-
- rok8s/get_vault_env:
112-
vault_path: repo/pluto/env
113-
- run:
114-
name: docker login
115-
command: |
116-
docker login -u _json_key -p "$(echo $GCP_ARTIFACTREADWRITE_JSON_KEY | base64 -d)" us-docker.pkg.dev
117-
- install_goreleaser_dependencies
118-
- run:
119-
name: run goreleaser (host Docker + binfmt for armv7)
120-
command: |
121-
export GORELEASER_CURRENT_TAG="${CIRCLE_TAG}"
122-
docker run --rm \
123-
-v "$(pwd)":/workspace \
124-
-v /var/run/docker.sock:/var/run/docker.sock \
125-
-w /workspace \
126-
--env-file <(env) \
127-
goreleaser/goreleaser:v2.14.0
12885
snapshot:
12986
working_directory: /home/circleci/go/src/github.com/fairwindsops/pluto
13087
resource_class: large
@@ -190,15 +147,16 @@ workflows:
190147
<<: *e2e_config
191148
release:
192149
jobs:
193-
- release_machine:
150+
- release:
151+
context: org-global
194152
filters:
195153
branches:
196154
ignore: /.*/
197155
tags:
198156
only: /.*/
199157
- oss-docs/publish-docs:
200158
requires:
201-
- release_machine
159+
- release
202160
repository: pluto
203161
filters:
204162
branches:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM alpine:3.23.3
22

3-
RUN apk update && apk upgrade --no-cache
3+
RUN apk update && apk -U upgrade --no-cache
44

55
LABEL org.opencontainers.image.authors="FairwindsOps, Inc." \
66
org.opencontainers.image.vendor="FairwindsOps, Inc." \

0 commit comments

Comments
 (0)