From 21bd9dacd6fa24fe172e1d0aac0b4611631c9d56 Mon Sep 17 00:00:00 2001 From: Stephanie Closson Date: Tue, 5 May 2020 13:57:08 -0600 Subject: [PATCH] Toolkit: Docker images/Add grabpl tool for deploys (#24309) * Add grabpl tool for deploys * Rest of the files --- .../docker/grafana-plugin-ci-alpine/build.sh | 8 ++++++-- .../grafana-plugin-ci-alpine/scripts/deploy.sh | 12 ++++++------ .../docker/grafana-plugin-ci-e2e/build.sh | 8 ++++++-- .../docker/grafana-plugin-ci-e2e/scripts/deploy.sh | 10 +++++++--- .../docker/grafana-plugin-ci/scripts/deploy.sh | 7 +++++-- 5 files changed, 30 insertions(+), 15 deletions(-) diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/build.sh b/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/build.sh index 152a546fee6..d24e4141c6b 100755 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/build.sh +++ b/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/build.sh @@ -1,8 +1,12 @@ #!/bin/bash +set -eo pipefail + source ./common.sh output=$(docker build . | tee /dev/tty) hash=$(echo "$output" | tail -1 | sed -ne "s/^Successfully built \(.*\)/\1/p") -docker tag "$hash" $DOCKER_IMAGE_NAME:latest -docker push $DOCKER_IMAGE_NAME:latest +if [ ${#hash} -gt 0 ]; then + docker tag "$hash" $DOCKER_IMAGE_NAME:latest + docker push $DOCKER_IMAGE_NAME:latest +fi diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy.sh b/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy.sh index 0ba20584bd4..4e02e40095f 100755 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy.sh +++ b/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy.sh @@ -1,4 +1,5 @@ #!/bin/sh +set -eo pipefail source "./deploy-common.sh" # Make libgcc compatible @@ -27,10 +28,10 @@ get_file "https://github.com/golangci/golangci-lint/releases/download/v1.23.7/$f "/tmp/$filename" \ "34df1794a2ea8e168b3c98eed3cc0f3e13ed4cba735e4e40ef141df5c41bc086" untar_file "/tmp/$filename" -chmod 755 /usr/local/bin/golangci-lint ln -s /usr/local/golangci-lint-1.23.7-linux-amd64/golangci-lint /usr/local/bin/golangci-lint ln -s /usr/local/go/bin/go /usr/local/bin/go ln -s /usr/local/go/bin/gofmt /usr/local/bin/gofmt +chmod 755 /usr/local/bin/golangci-lint # Install dependencies apk add fontconfig zip jq @@ -38,9 +39,12 @@ apk add fontconfig zip jq # Install code climate get_file "https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64" \ "/usr/local/bin/cc-test-reporter" \ - "38f2442892027f61a07f52c845818750261b2ba58bffb043a582495339d37c05" + "b4138199aa755ebfe171b57cc46910b13258ace5fbc4eaa099c42607cd0bff32" chmod +x /usr/local/bin/cc-test-reporter +wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.4.4/grabpl" +chmod +x /usr/local/bin/grabpl + apk add git # Install Mage mkdir -pv /tmp/mage $HOME/go/bin @@ -56,10 +60,6 @@ for file in $(ls $HOME/go/bin); do mv -v $HOME/go/bin/$file /usr/local/bin/$file done -ls -l /usr/local/bin -revive --help -file /usr/local/bin/revive - # Cleanup after yourself /bin/rm -rf /tmp/mage /bin/rm -rf $HOME/go diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/build.sh b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/build.sh index 152a546fee6..d24e4141c6b 100755 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/build.sh +++ b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/build.sh @@ -1,8 +1,12 @@ #!/bin/bash +set -eo pipefail + source ./common.sh output=$(docker build . | tee /dev/tty) hash=$(echo "$output" | tail -1 | sed -ne "s/^Successfully built \(.*\)/\1/p") -docker tag "$hash" $DOCKER_IMAGE_NAME:latest -docker push $DOCKER_IMAGE_NAME:latest +if [ ${#hash} -gt 0 ]; then + docker tag "$hash" $DOCKER_IMAGE_NAME:latest + docker push $DOCKER_IMAGE_NAME:latest +fi diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh index e8e84ff8607..efea8b74f9c 100755 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh +++ b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh @@ -1,4 +1,6 @@ #!/bin/bash +set -eo pipefail + source "/etc/profile" source "./deploy-slim.sh" source "./deploy-common.sh" @@ -11,7 +13,6 @@ wget -O - "https://nodejs.org/dist/v12.16.2/node-${NODEVER}.tar.xz" | tar Jvxf - pushd /tmp/node-${NODEVER} /bin/rm -f CHANGELOG.md README.md LICENSE /bin/cp -r * /usr/local -/bin/cp -r .??* /usr/local popd /bin/rm -rf /tmp/node-${NODEVER} @@ -32,17 +33,20 @@ get_file "https://github.com/golangci/golangci-lint/releases/download/v1.23.7/$f "/tmp/$filename" \ "34df1794a2ea8e168b3c98eed3cc0f3e13ed4cba735e4e40ef141df5c41bc086" untar_file "/tmp/$filename" -chmod 755 /usr/local/bin/golangci-lint ln -s /usr/local/golangci-lint-1.23.7-linux-amd64/golangci-lint /usr/local/bin/golangci-lint ln -s /usr/local/go/bin/go /usr/local/bin/go ln -s /usr/local/go/bin/gofmt /usr/local/bin/gofmt +chmod 755 /usr/local/bin/golangci-lint # Install code climate get_file "https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64" \ "/usr/local/bin/cc-test-reporter" \ - "38f2442892027f61a07f52c845818750261b2ba58bffb043a582495339d37c05" + "b4138199aa755ebfe171b57cc46910b13258ace5fbc4eaa099c42607cd0bff32" chmod 755 /usr/local/bin/cc-test-reporter +wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.4.4/grabpl" +chmod +x /usr/local/bin/grabpl + # Install Mage mkdir -pv /tmp/mage $HOME/go/bin git clone https://github.com/magefile/mage.git /tmp/mage diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh b/packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh index 1bdb094137e..be89bb48536 100755 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh +++ b/packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh @@ -24,9 +24,12 @@ apt-get update -y && apt-get install -y adduser libfontconfig1 locate && /bin/rm # Install code climate get_file "https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64" \ "/usr/local/bin/cc-test-reporter" \ - "38f2442892027f61a07f52c845818750261b2ba58bffb043a582495339d37c05" + "b4138199aa755ebfe171b57cc46910b13258ace5fbc4eaa099c42607cd0bff32" chmod +x /usr/local/bin/cc-test-reporter +wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.4.4/grabpl" +chmod +x /usr/local/bin/grabpl + # Install Mage mkdir -pv /tmp/mage $HOME/go/bin git clone https://github.com/magefile/mage.git /tmp/mage @@ -40,4 +43,4 @@ mv $HOME/go/bin/mage /usr/local/bin sudo -u circleci ./deploy-user.sh # Get the size down -/bin/rm -rf /var/lib/apt/lists \ No newline at end of file +/bin/rm -rf /var/lib/apt/lists