From c0c91b4aad41c5f50246286056aa57dbc5585b3d Mon Sep 17 00:00:00 2001 From: Harvey Tindall Date: Wed, 20 Dec 2023 20:06:44 +0000 Subject: [PATCH] drone: source buildrone key from drone in docker build --- .drone.yml | 7 ++++++- updater.go | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index aa5e652..86df18a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -131,6 +131,9 @@ steps: volumes: - name: ssh_key path: /root/drone_rsa + environment: + BUILDRONE_KEY: + from_secret: BUILDRONE_KEY settings: host: from_secret: ssh2_host @@ -140,13 +143,15 @@ steps: from_secret: ssh2_port volumes: - /root/.ssh/docker-build:/root/drone_rsa + envs: + - buildrone_key key_path: /root/drone_rsa command_timeout: 50m script: - /mnt/buildx/jfa-go/build.sh - wget https://builds.hrfee.pw/upload.py -O /mnt/buildx/jfa-go/jfa-go/upload.py - pip3 install requests - - bash -c 'cd /mnt/buildx/jfa-go/jfa-go && BUILDRONE_KEY=$(cat /mnt/buildx/jfa-go/key) python3 upload.py https://builds.hrfee.pw hrfee jfa-go --tag docker-unstable=true' + - bash -c 'cd /mnt/buildx/jfa-go/jfa-go && python3 upload.py https://builds.hrfee.pw hrfee jfa-go --tag docker-unstable=true' - rm -f /mnt/buildx/jfa-go/jfa-go/upload.py trigger: branch: diff --git a/updater.go b/updater.go index 1e0e78a..7df4123 100644 --- a/updater.go +++ b/updater.go @@ -161,6 +161,7 @@ func newUpdater(buildroneURL, namespace, repo, version, commit, buildType string if runtime.GOOS == "windows" { binary += ".exe" } + fmt.Println("monitoring", tag) return &Updater{ httpClient: &http.Client{Timeout: 10 * time.Second}, timeoutHandler: common.NewTimeoutHandler("updater", buildroneURL, true), @@ -211,7 +212,7 @@ func (ud *Updater) GetTag() (Tag, int, error) { var tag Tag err = json.Unmarshal(body, &tag) if tag.Version == "" { - err = errors.New("Tag was empty") + err = errors.New("Tag at \"" + url + "\" was empty") } return tag, resp.StatusCode, err }