Skip to content

Commit e76a9dd

Browse files
authored
Docker fixes (#5)
1 parent 1be3dd2 commit e76a9dd

2 files changed

Lines changed: 6 additions & 14 deletions

File tree

.github/workflows/docker.yml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,10 @@ jobs:
2626
echo ::set-output name=major_tag::${MAJOR_ONLY}
2727
echo ::set-output name=major_minor_tag::${MAJOR_MINOR}
2828
echo ::set-output name=short_commit::${SHORT_COMMIT}
29-
if [[ ${{ matrix.target.Dockerfile }} == *"alpine"* ]]; then
30-
echo ::set-output name=full_tag_name::${TAG}-alpine
31-
echo ::set-output name=full_major_tag::${MAJOR_ONLY}-alpine
32-
echo ::set-output name=full_major_minor_tag::${MAJOR_MINOR}-alpine
33-
echo ::set-output name=latest_tag::latest-alpine
34-
else
35-
echo ::set-output name=full_tag_name::${TAG}
36-
echo ::set-output name=full_major_tag::${MAJOR_ONLY}
37-
echo ::set-output name=full_major_minor_tag::${MAJOR_MINOR}
38-
echo ::set-output name=latest_tag::latest
39-
fi
29+
echo ::set-output name=full_tag_name::${TAG}
30+
echo ::set-output name=full_major_tag::${MAJOR_ONLY}
31+
echo ::set-output name=full_major_minor_tag::${MAJOR_MINOR}
32+
echo ::set-output name=latest_tag::latest
4033
4134
4235
- name: Log in to the Container registry
@@ -59,8 +52,7 @@ jobs:
5952
platforms: linux/amd64,linux/arm64
6053
push: true
6154
build-args: |
62-
BUILD_VERSION=${{ steps.prepare.outputs.tag_name }}
63-
BUILD_SHA=${{ steps.prepare.outputs.short_commit }}
55+
RSHELL_VERSION=${{ steps.prepare.outputs.tag_name }}
6456
tags: |
6557
ghcr.io/${{ github.repository }}:${{ steps.prepare.outputs.full_tag_name }}
6658
ghcr.io/${{ github.repository }}:${{ steps.prepare.outputs.full_major_tag }}

.goreleaser.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ archives:
3636
checksum:
3737
name_template: 'checksums.txt'
3838
snapshot:
39-
name_template: "{{ .Version }}"
39+
name_template: "{{ .Tag }}"
4040
release:
4141
draft: true
4242
changelog:

0 commit comments

Comments
 (0)