Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplify goreleaser Dockerfiles #431

Merged
merged 1 commit into from Feb 10, 2022
Merged

Simplify goreleaser Dockerfiles #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
120 changes: 9 additions & 111 deletions .goreleaser.yaml
View file
Open in desktop
Expand Up @@ -21,130 +21,28 @@ builds:
- "-s -w -X pkg.Version={{.Version}} -X pkg.CommitID={{.Commit}} -buildid=''"

dockers:
jyotimahapatra marked this conversation as resolved.
Show resolved Hide resolved
- ids:
- aws-iam-authenticator
use: buildx
- use: buildx
goarch: amd64
dockerfile: Dockerfile.scratch
goos: linux
build_flag_templates:
- "--platform=linux/amd64"
- "--platform=linux/amd64"
dockerfile: Dockerfile.goreleaser
image_templates:
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-scratch-amd64"
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-amd64"
- ids:
- aws-iam-authenticator
use: buildx
- use: buildx
goarch: arm64
dockerfile: Dockerfile.scratch
goos: linux
build_flag_templates:
- "--platform=linux/arm64"
- "--platform=linux/arm64"
dockerfile: Dockerfile.goreleaser
image_templates:
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-scratch-arm64"
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-arm64"
- ids:
- aws-iam-authenticator
dockerfile: Dockerfile.alpine-3.6
image_templates:
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-alpine-3.6"
- ids:
- aws-iam-authenticator
use: buildx
goarch: amd64
dockerfile: Dockerfile.alpine-3.7
build_flag_templates:
- "--platform=linux/amd64"
image_templates:
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-alpine-3.7-amd64"
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-alpine-amd64"
- ids:
- aws-iam-authenticator
use: buildx
goarch: arm64
dockerfile: Dockerfile.alpine-3.7
build_flag_templates:
- "--platform=linux/arm64"
image_templates:
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-alpine-3.7-arm64"
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-alpine-arm64"
- ids:
- aws-iam-authenticator
dockerfile: Dockerfile.debian-jessie
image_templates:
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-debian-jessie"
- ids:
- aws-iam-authenticator
use: buildx
goarch: amd64
dockerfile: Dockerfile.debian-stretch
build_flag_templates:
- "--platform=linux/amd64"
image_templates:
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-debian-stretch-amd64"
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-debian-amd64"
- ids:
- aws-iam-authenticator
use: buildx
goarch: arm64
dockerfile: Dockerfile.debian-stretch
build_flag_templates:
- "--platform=linux/arm64"
image_templates:
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-debian-stretch-3.7-arm64"
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-debian-arm64"
- ids:
- aws-iam-authenticator
use: buildx
goarch: amd64
dockerfile: Dockerfile.amazonlinux-2
build_flag_templates:
- "--platform=linux/amd64"
image_templates:
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-amazonlinux-2-amd64"
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-amazonlinux-amd64"
- ids:
- aws-iam-authenticator
use: buildx
goarch: arm64
dockerfile: Dockerfile.amazonlinux-2
build_flag_templates:
- "--platform=linux/arm64"
image_templates:
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-amazonlinux-2-arm64"
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-amazonlinux-arm64"
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-arm64"

docker_manifests:
- name_template: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-scratch"
image_templates:
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-scratch-amd64"
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-scratch-arm64"
- name_template: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}"
image_templates:
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-amd64"
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-arm64"
- name_template: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-alpine-3.7"
image_templates:
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-alpine-3.7-amd64"
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-alpine-3.7-arm64"
- name_template: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-alpine"
image_templates:
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-alpine-amd64"
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-alpine-arm64"
- name_template: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-debian-stretch"
image_templates:
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-debian-stretch-amd64"
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-debian-stretch-arm64"
- name_template: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-debian"
image_templates:
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-debian-amd64"
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-debian-arm64"
- name_template: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-amazonlinux-2"
image_templates:
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-amazonlinux-2-amd64"
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-amazonlinux-2-arm64"
- name_template: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-amazonlinux"
image_templates:
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-amazonlinux-amd64"
- "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:{{ .Tag }}-amazonlinux-arm64"

snapshot:
name_template: "git-{{.ShortCommit}}"
Expand Down
21 changes: 0 additions & 21 deletions Dockerfile.alpine-3.7
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions Dockerfile.amazonlinux-2
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions Dockerfile.debian-jessie
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions Dockerfile.debian-stretch
View file
Open in desktop

This file was deleted.

14 changes: 7 additions & 7 deletions Dockerfile.alpine-3.6 → Dockerfile.goreleaser
View file
Open in desktop
@@ -1,4 +1,4 @@
# Copyright 2017 by the contributors.
# Copyright 2022 The Kubernetes Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -11,11 +11,11 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
ARG image=public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-nonroot:2021-12-01-1638322424

FROM alpine:3.6
RUN adduser -D -u 10000 aws-iam-authenticator
RUN apk add --update ca-certificates
COPY aws-iam-authenticator /
RUN chown aws-iam-authenticator /aws-iam-authenticator
USER aws-iam-authenticator
FROM public.ecr.aws/eks-distro/kubernetes/go-runner:v0.9.0-eks-1-21-4 as go-runner

FROM $image
COPY --from=go-runner /usr/local/bin/go-runner /usr/local/bin/go-runner
COPY aws-iam-authenticator /aws-iam-authenticator
ENTRYPOINT ["/aws-iam-authenticator"]
26 changes: 0 additions & 26 deletions Dockerfile.scratch
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion Makefile
View file
Open in desktop
Expand Up @@ -81,7 +81,6 @@ build-all-bins:
.PHONY: image
image:
docker buildx build --output=type=registry --platform linux/amd64,linux/arm64 \
--build-arg image=public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-nonroot:2021-08-26-1630012071 \
--tag aws-iam-authenticator:$(VERSION)_$(GIT_COMMIT)_$(BUILD_DATE_STRIPPED) .

.PHONY: goreleaser
Expand Down