Skip to content

Commit 38e676e

Browse files
authored
upgraded versions/dependencies/deprecations (#454)
* upgrade go versions/dependencies * updated deprecated goreleaser code for homebrew * updated deprecated goreleaser code for docker
1 parent 369c85b commit 38e676e

4 files changed

Lines changed: 247 additions & 276 deletions

File tree

.goreleaser.yaml

Lines changed: 40 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -39,83 +39,54 @@ changelog:
3939
disable: false
4040
use: git
4141

42-
brews:
42+
homebrew_casks:
4343
- name: hauler
4444
repository:
4545
owner: hauler-dev
4646
name: homebrew-tap
4747
token: "{{ .Env.HOMEBREW_TAP_GITHUB_TOKEN }}"
4848
directory: Formula
49-
description: "Hauler CLI"
49+
description: "Hauler: Airgap Swiss Army Knife"
5050

51-
dockers:
52-
- id: hauler-amd64
53-
goos: linux
54-
goarch: amd64
55-
use: buildx
51+
dockers_v2:
52+
- id: hauler
5653
dockerfile: Dockerfile
57-
build_flag_templates:
58-
- "--platform=linux/amd64"
54+
flags:
5955
- "--target=release"
60-
image_templates:
61-
- "docker.io/hauler/hauler-amd64:{{ .Version }}"
62-
- "ghcr.io/hauler-dev/hauler-amd64:{{ .Version }}"
63-
- id: hauler-arm64
64-
goos: linux
65-
goarch: arm64
66-
use: buildx
67-
dockerfile: Dockerfile
68-
build_flag_templates:
69-
- "--platform=linux/arm64"
70-
- "--target=release"
71-
image_templates:
72-
- "docker.io/hauler/hauler-arm64:{{ .Version }}"
73-
- "ghcr.io/hauler-dev/hauler-arm64:{{ .Version }}"
74-
- id: hauler-debug-amd64
75-
goos: linux
76-
goarch: amd64
77-
use: buildx
78-
dockerfile: Dockerfile
79-
build_flag_templates:
80-
- "--platform=linux/amd64"
81-
- "--target=debug"
82-
image_templates:
83-
- "docker.io/hauler/hauler-debug-amd64:{{ .Version }}"
84-
- "ghcr.io/hauler-dev/hauler-debug-amd64:{{ .Version }}"
85-
- id: hauler-debug-arm64
86-
goos: linux
87-
goarch: arm64
88-
use: buildx
56+
images:
57+
- docker.io/hauler/hauler
58+
- ghcr.io/hauler-dev/hauler
59+
tags:
60+
- "{{ .Version }}"
61+
platforms:
62+
- linux/amd64
63+
- linux/arm64
64+
labels:
65+
"classification": "UNCLASSIFIED"
66+
"org.opencontainers.image.created": "{{.Date}}"
67+
"org.opencontainers.image.description": "Hauler: Airgap Swiss Army Knife"
68+
"org.opencontainers.image.name": "{{.ProjectName}}-debug"
69+
"org.opencontainers.image.revision": "{{.FullCommit}}"
70+
"org.opencontainers.image.source": "{{.GitURL}}"
71+
"org.opencontainers.image.version": "{{.Version}}"
72+
73+
- id: hauler-debug
8974
dockerfile: Dockerfile
90-
build_flag_templates:
91-
- "--platform=linux/arm64"
75+
flags:
9276
- "--target=debug"
93-
image_templates:
94-
- "docker.io/hauler/hauler-debug-arm64:{{ .Version }}"
95-
- "ghcr.io/hauler-dev/hauler-debug-arm64:{{ .Version }}"
96-
97-
docker_manifests:
98-
- id: hauler-docker
99-
use: docker
100-
name_template: "docker.io/hauler/hauler:{{ .Version }}"
101-
image_templates:
102-
- "docker.io/hauler/hauler-amd64:{{ .Version }}"
103-
- "docker.io/hauler/hauler-arm64:{{ .Version }}"
104-
- id: hauler-ghcr
105-
use: docker
106-
name_template: "ghcr.io/hauler-dev/hauler:{{ .Version }}"
107-
image_templates:
108-
- "ghcr.io/hauler-dev/hauler-amd64:{{ .Version }}"
109-
- "ghcr.io/hauler-dev/hauler-arm64:{{ .Version }}"
110-
- id: hauler-debug-docker
111-
use: docker
112-
name_template: "docker.io/hauler/hauler-debug:{{ .Version }}"
113-
image_templates:
114-
- "docker.io/hauler/hauler-debug-amd64:{{ .Version }}"
115-
- "docker.io/hauler/hauler-debug-arm64:{{ .Version }}"
116-
- id: hauler-debug-ghcr
117-
use: docker
118-
name_template: "ghcr.io/hauler-dev/hauler-debug:{{ .Version }}"
119-
image_templates:
120-
- "ghcr.io/hauler-dev/hauler-debug-amd64:{{ .Version }}"
121-
- "ghcr.io/hauler-dev/hauler-debug-arm64:{{ .Version }}"
77+
images:
78+
- docker.io/hauler/hauler-debug
79+
- ghcr.io/hauler-dev/hauler-debug
80+
tags:
81+
- "{{ .Version }}"
82+
platforms:
83+
- linux/amd64
84+
- linux/arm64
85+
labels:
86+
"classification": "UNCLASSIFIED"
87+
"org.opencontainers.image.created": "{{.Date}}"
88+
"org.opencontainers.image.description": "Hauler: Airgap Swiss Army Knife"
89+
"org.opencontainers.image.name": "{{.ProjectName}}-debug"
90+
"org.opencontainers.image.revision": "{{.FullCommit}}"
91+
"org.opencontainers.image.source": "{{.GitURL}}"
92+
"org.opencontainers.image.version": "{{.Version}}"

Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# builder stage
2-
FROM registry.suse.com/bci/bci-base:15.5 AS builder
2+
FROM registry.suse.com/bci/bci-base:15.7 AS builder
3+
ARG TARGETPLATFORM
34

4-
# fetched from goreleaser build proccess
5-
COPY hauler /hauler
5+
# fetched from goreleaser build process
6+
COPY $TARGETPLATFORM/hauler /hauler
67

78
RUN echo "hauler:x:1001:1001::/home/hauler:" > /etc/passwd \
89
&& echo "hauler:x:1001:hauler" > /etc/group \
@@ -39,4 +40,4 @@ COPY --from=builder --chown=hauler:hauler /hauler /usr/local/bin/hauler
3940
RUN apk --no-cache add curl
4041

4142
USER hauler
42-
WORKDIR /home/hauler
43+
WORKDIR /home/hauler

0 commit comments

Comments
 (0)