RPJosh
/
authelia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Buildkite] Do not persist Docker secret in builds (#603)

pull/604/head
Amir Zarrinkafsh 2020-02-01 19:10:18 +11:00 committed by GitHub
parent 275af90137
commit 1b478e8f3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.buildkite/hooks/post-command
View File

@ -10,6 +10,10 @@ if [[ $BUILDKITE_LABEL =~ ":selenium:" ]] || [[ $BUILDKITE_LABEL =~ ":docker: Bu
fi fi
fi fi
if [[ $BUILDKITE_LABEL =~ ":docker: Deploy" ]]; then
docker logout
fi
if [[ $BUILDKITE_BRANCH == "master" ]] || [[ $BUILDKITE_BRANCH =~ ^v.* ]] && [[ $BUILDKITE_PULL_REQUEST == "false" ]]; then if [[ $BUILDKITE_BRANCH == "master" ]] || [[ $BUILDKITE_BRANCH =~ ^v.* ]] && [[ $BUILDKITE_PULL_REQUEST == "false" ]]; then
if [[ $BUILDKITE_LABEL == ":docker: Deploy Manifests" ]]; then if [[ $BUILDKITE_LABEL == ":docker: Deploy Manifests" ]]; then
echo "--- :docker: Removing tags for deleted branches" echo "--- :docker: Removing tags for deleted branches"

5
cmd/authelia-scripts/cmd_docker.go
View File

@ -16,7 +16,6 @@ var arch string
var supportedArch = []string{"amd64", "arm32v7", "arm64v8"} var supportedArch = []string{"amd64", "arm32v7", "arm64v8"}
var defaultArch = "amd64" var defaultArch = "amd64"
var buildkite = os.Getenv("BUILDKITE")
var buildkiteQEMU = os.Getenv("BUILDKITE_AGENT_META_DATA_QEMU") var buildkiteQEMU = os.Getenv("BUILDKITE_AGENT_META_DATA_QEMU")
var ciBranch = os.Getenv("BUILDKITE_BRANCH") var ciBranch = os.Getenv("BUILDKITE_BRANCH")
var ciPullRequest = os.Getenv("BUILDKITE_PULL_REQUEST") var ciPullRequest = os.Getenv("BUILDKITE_PULL_REQUEST")
@ -145,10 +144,6 @@ func login(docker *Docker) {
username := os.Getenv("DOCKER_USERNAME") username := os.Getenv("DOCKER_USERNAME")
password := os.Getenv("DOCKER_PASSWORD") password := os.Getenv("DOCKER_PASSWORD")
if buildkite == "true" {
return
}
if username == "" { if username == "" {
log.Fatal(errors.New("DOCKER_USERNAME is empty")) log.Fatal(errors.New("DOCKER_USERNAME is empty"))
} }