Skip to content

Commit e663fbb

Browse files
unguiculusscottrigby
authored andcommitted
Update Goreleaser (#76)
Signed-off-by: Reinhard Nägele <[email protected]>
1 parent 9084cf1 commit e663fbb

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
name: Install tools
2121
command: |
2222
apk add bash build-base ca-certificates curl docker git openssh
23-
curl -SLO https://github.com/goreleaser/goreleaser/releases/download/v0.93.0/goreleaser_Linux_x86_64.tar.gz
23+
curl -SLO https://github.com/goreleaser/goreleaser/releases/download/v0.95.2/goreleaser_Linux_x86_64.tar.gz
2424
mkdir -p /usr/local/goreleaser
2525
tar -xzf goreleaser_Linux_x86_64.tar.gz -C /usr/local/goreleaser
2626
ln -s /usr/local/goreleaser/goreleaser /usr/local/bin/goreleaser

.goreleaser.yml

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ dockers:
4141
- quay.io/helmpack/chart-testing:{{ .Tag }}
4242
- quay.io/helmpack/chart-testing:latest
4343
build_flag_templates:
44-
- --build-arg=dist_dir=
4544
- --label=org.label-schema.schema-version=1.0
4645
- --label=org.label-schema.version={{ .Version }}
4746
- --label=org.label-schema.name={{ .ProjectName }}

Dockerfile

+3-7
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@ RUN curl -LO "https://kubernetes-helm.storage.googleapis.com/helm-$HELM_VERSION-
3232
ln -s "/usr/local/helm-$HELM_VERSION/linux-amd64/helm" /usr/local/bin/helm && \
3333
rm -f "helm-$HELM_VERSION-linux-amd64.tar.gz"
3434

35-
# Goreleaser needs to override this because it builds the
36-
# Dockerfile from a tmp dir with all files to be copied in the root
37-
ARG dist_dir=dist/linux_amd64
38-
39-
COPY "$dist_dir/chart_schema.yaml" /etc/ct/chart_schema.yaml
40-
COPY "$dist_dir/lintconf.yaml" /etc/ct/lintconf.yaml
41-
COPY "$dist_dir/ct" /usr/local/bin/ct
35+
COPY ./etc/chart_schema.yaml /etc/ct/chart_schema.yaml
36+
COPY ./etc/lintconf.yaml /etc/ct/lintconf.yaml
37+
COPY ct /usr/local/bin/ct

0 commit comments

Comments
 (0)