Commit 16fa128e authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson

Fix passing AWS creds through Dapper

parent 4e2e91e0
...@@ -44,7 +44,7 @@ ARG SELINUX=true ...@@ -44,7 +44,7 @@ ARG SELINUX=true
ENV SELINUX $SELINUX ENV SELINUX $SELINUX
ENV DAPPER_RUN_ARGS --privileged -v k3s-cache:/go/src/github.com/k3s-io/k3s/.cache -v trivy-cache:/root/.cache/trivy ENV DAPPER_RUN_ARGS --privileged -v k3s-cache:/go/src/github.com/k3s-io/k3s/.cache -v trivy-cache:/root/.cache/trivy
ENV DAPPER_ENV REPO TAG DRONE_TAG IMAGE_NAME SKIP_VALIDATE SKIP_AIRGAP GCLOUD_AUTH GITHUB_TOKEN GOLANG DEBUG ENV DAPPER_ENV REPO TAG DRONE_TAG IMAGE_NAME SKIP_VALIDATE SKIP_AIRGAP AWS_SECRET_ACCESS_KEY AWS_ACCESS_KEY_ID GITHUB_TOKEN GOLANG DEBUG
ENV DAPPER_SOURCE /go/src/github.com/k3s-io/k3s/ ENV DAPPER_SOURCE /go/src/github.com/k3s-io/k3s/
ENV DAPPER_OUTPUT ./bin ./dist ./build/out ./build/static ./pkg/static ./pkg/deploy ENV DAPPER_OUTPUT ./bin ./dist ./build/out ./build/static ./pkg/static ./pkg/deploy
......
...@@ -2,9 +2,11 @@ ...@@ -2,9 +2,11 @@
# Check for AWS Credentials # Check for AWS Credentials
[ -n "$AWS_SECRET_ACCESS_KEY" ] || { [ -n "$AWS_SECRET_ACCESS_KEY" ] || {
echo "AWS_SECRET_ACCESS_KEY is not set"
exit 0 exit 0
} }
[ -n "$AWS_ACCESS_KEY_ID" ] || { [ -n "$AWS_ACCESS_KEY_ID" ] || {
echo "AWS_ACCESS_KEY_ID is not set"
exit 0 exit 0
} }
......
...@@ -2,9 +2,11 @@ ...@@ -2,9 +2,11 @@
# Check for AWS Credentials # Check for AWS Credentials
[ -n "$AWS_SECRET_ACCESS_KEY" ] || { [ -n "$AWS_SECRET_ACCESS_KEY" ] || {
echo "AWS_SECRET_ACCESS_KEY is not set"
exit 0 exit 0
} }
[ -n "$AWS_ACCESS_KEY_ID" ] || { [ -n "$AWS_ACCESS_KEY_ID" ] || {
echo "AWS_ACCESS_KEY_ID is not set"
exit 0 exit 0
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment