Skip to content

Commit a93d868

Browse files
author
Joe Doss
committed
Move env stuff to .release-env
1 parent 186d6d7 commit a93d868

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

.github/workflows/release.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,11 @@ jobs:
9090
# shellcheck disable=SC2129
9191
echo 'GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}' > .release-env
9292
echo 'GORELEASER_KEY=${{ secrets.GORELEASER_KEY }}' >> .release-env
93+
echo 'AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }}' >> .release-env
94+
echo 'AWS_S3_BUCKET=${{ secrets.AWS_S3_BUCKET }}' >> .release-env
95+
echo 'AWS_S3_REGION=${{ secrets.AWS_S3_REGION }}' >> .release-env
96+
echo 'AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }}' >> .release-env
97+
echo 'NFPM_PASSPHRASE=${{ secrets.GPG_PRIVATE_KEY_PASSWORD }}' >> .release-env
9398
9499
- name: Write GPG private key to file
95100
run: |
@@ -148,6 +153,7 @@ jobs:
148153
- name: Shred and remove GPG private key
149154
run: |
150155
shred -zun 3 "${GPG_PRIVATE_KEY_FILE}"
156+
shred -zun 3 .release-env
151157
shell: bash
152158

153159
build_upload_docker:

Makefile

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -144,16 +144,6 @@ release:
144144
exit 1;\
145145
fi
146146
$Q @docker run --rm --privileged -e CGO_ENABLED=1 --env-file .release-env \
147-
-e AWS_ACCESS_KEY_ID=$(AWS_ACCESS_KEY_ID) \
148-
-e AWS_S3_BUCKET=$(AWS_S3_BUCKET) \
149-
-e AWS_S3_REGION=$(AWS_S3_REGION) \
150-
-e AWS_SECRET_ACCESS_KEY=$(AWS_SECRET_ACCESS_KEY) \
151-
-e GITHUB_TOKEN=$(GITHUB_TOKEN) \
152-
-e GORELEASER_KEY=$(GORELEASER_KEY) \
153-
-e GPG_PRIVATE_KEY_FILE=$(GPG_PRIVATE_KEY_FILE) \
154-
-e IS_PRERELEASE=$(IS_PRERELEASE) \
155-
-e NFPM_PASSPHRASE=$(NFPM_PASSPHRASE) \
156-
-e RELEASE_DATE=$(RELEASE_DATE) \
157147
--entrypoint /go/src/$(PKG)/docker/build/entrypoint.sh \
158148
-v ./$(GPG_PRIVATE_KEY_FILE):/$(GPG_PRIVATE_KEY_FILE) \
159149
-v $(DOCKER_SOCK):/var/run/docker.sock \

0 commit comments

Comments
 (0)