diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/README.md b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/README.md index 51f67cf4062..00343cfe284 100644 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/README.md +++ b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/README.md @@ -1,22 +1,18 @@ # Using this docker image -Currently tagged and uploaded to dockerhub as srclosson/integrations-ci-build - -Based off of `circleci/node:12-browsers` - ## User The user will be `circleci` The home directory will be `/home/circleci` ## Node -- node 12 is installed +- node 14 is installed - yarn is installed globally - npm is installed globally ## Go - Go is installed in `/usr/local/bin/go` - golangci-lint is installed in `/usr/local/bin/golangci-lint` -- mage is installed in `/home/circleci/go/bin/mage` +- mage is installed in `/usr/local/bin/mage` All of the above directories are in the path, so there is no need to specify fully qualified paths. @@ -45,7 +41,7 @@ To test, your CircleCI config will need a run section with something similar to # Building -To build, cd to `/packages/grafana-toolkit/docker/grafana-plugin-ci` +To build, cd to `/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e` ``` ./build.sh ``` diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/common.sh b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/common.sh index 06b7895890a..2e72f98af51 100755 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/common.sh +++ b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/common.sh @@ -5,5 +5,5 @@ ## DOCKER_IMAGE_BASE_NAME="grafana/grafana-plugin-ci-e2e" -DOCKER_IMAGE_VERSION="1.2.1" +DOCKER_IMAGE_VERSION="1.3.0" DOCKER_IMAGE_NAME="${DOCKER_IMAGE_BASE_NAME}:${DOCKER_IMAGE_VERSION}" 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 1176612ef6e..f4f7b5d96df 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 @@ -10,7 +10,7 @@ NODEVER="v14.17.3" wget -O - "https://nodejs.org/dist/${NODEVER}/node-${NODEVER}-linux-x64.tar.xz" | tar Jvxf - -C "/tmp" # Move node to /usr/local so it's in the path -pushd /tmp/node-${NODEVER} +pushd /tmp/node-${NODEVER}-linux-x64 /bin/rm -f CHANGELOG.md README.md LICENSE /bin/cp -r * /usr/local popd