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

Fix docker labels #75

Merged
merged 5 commits into from
Nov 5, 2021
Merged

Fix docker labels #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ae98a08
Use correct opencontainers annotation for created
marcofranssen Nov 2, 2021
57fd9be
Simplify release docker image by reusing the goreleaser variables ava…
marcofranssen Nov 2, 2021
b03b231
Add opcontainers vendor label for docker image
marcofranssen Nov 2, 2021
aaa84a3
Use .Version for tagging docker images
marcofranssen Nov 2, 2021
a620c5b
Bump actions/checkout from v2.3.5 to v2.4.0
marcofranssen Nov 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
go-version: 1.17

- name: Checkout
uses: actions/checkout@v2.3.5
uses: actions/checkout@v2.4.0

- name: Cache Go modules
uses: actions/cache@v2.1.6
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
go-version: 1.17

- name: Checkout
uses: actions/checkout@v2.3.5
uses: actions/checkout@v2.4.0
with:
fetch-depth: 0

Expand Down
11 changes: 6 additions & 5 deletions .goreleaser.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,19 @@ dockers:
- goos: linux
goarch: amd64
image_templates:
- "philipssoftware/{{ .ProjectName }}:{{ .Tag }}"
- "philipssoftware/{{ .ProjectName }}:{{ .Env.GIT_HASH }}"
- "ghcr.io/philips-labs/{{ .ProjectName }}:{{ .Tag }}"
- "ghcr.io/philips-labs/{{ .ProjectName }}:{{ .Env.GIT_HASH }}"
- "philipssoftware/{{ .ProjectName }}:{{ .Version }}"
- "philipssoftware/{{ .ProjectName }}:{{ .FullCommit }}"
- "ghcr.io/philips-labs/{{ .ProjectName }}:{{ .Version }}"
- "ghcr.io/philips-labs/{{ .ProjectName }}:{{ .FullCommit }}"
build_flag_templates:
- "--pull"
- "--label=com.opencontainers.image.created={{.Date}}"
- "--label=org.opencontainers.image.created={{.Date}}"
- "--label=org.opencontainers.image.title={{.ProjectName}}"
- "--label=org.opencontainers.image.description={{.ProjectName}}"
- "--label=org.opencontainers.image.revision={{.FullCommit}}"
- "--label=org.opencontainers.image.version={{.Version}}"
- "--label=org.opencontainers.image.licenses=MIT"
- "--label=org.opencontainers.image.vendor=Koninklijke Philips N.V."
extra_files:
- "Makefile"
- "go.mod"
Expand Down
5 changes: 2 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,12 @@ $(GO_PATH)/bin/goreleaser:

.PHONY: snapshot-release
snapshot-release: $(GO_PATH)/bin/goreleaser ## creates a snapshot release using goreleaser
LDFLAGS=$(LDFLAGS) GIT_TAG=$(GIT_TAG) GIT_HASH=$(GIT_HASH) goreleaser release --snapshot --rm-dist
LDFLAGS=$(LDFLAGS) goreleaser release --snapshot --rm-dist

.PHONY: release
release: $(GO_PATH)/bin/goreleaser ## creates a release using goreleaser
LDFLAGS=$(LDFLAGS) GIT_TAG=$(GIT_TAG) GIT_HASH=$(GIT_HASH) goreleaser release
LDFLAGS=$(LDFLAGS) goreleaser release

.PHONY: release-vars
release-vars: ## print the release variables for goreleaser
@echo export LDFLAGS=\"$(LDFLAGS)\"
@echo export GIT_HASH=$(GIT_HASH)