diff options
author | Paul Emm. Katsoulakis <34388743+paulkatsoulakis@users.noreply.github.com> | 2019-04-03 16:45:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-03 16:45:35 +0200 |
commit | beec069a3a93faf1b2679591a2055c49145fc444 (patch) | |
tree | 2d04b2bb31e0ec998a1f20d6034c76edc1458f08 | |
parent | b48ea20e0b1c0005d267db9c072edbc67982cf1a (diff) |
netdata/packaging/docker: Change password (#5790)
-rw-r--r-- | .travis/README.md | 2 | ||||
-rw-r--r-- | packaging/docker/README.md | 4 | ||||
-rwxr-xr-x | packaging/docker/build-test.sh | 10 | ||||
-rwxr-xr-x | packaging/docker/publish.sh | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/.travis/README.md b/.travis/README.md index d67df293dc..3c1a99527b 100644 --- a/.travis/README.md +++ b/.travis/README.md @@ -4,7 +4,7 @@ - GITHUB_TOKEN - GitHub token with push access to repository - DOCKER_USERNAME - Username (netdatabot) with write access to docker hub repository -- DOCKER_PASSWORD - Password to docker hub +- DOCKER_PASS - Password to docker hub - encrypted_8daf19481253_key - key needed by openssl to decrypt GCS credentials file - encrypted_8daf19481253_iv - IV needed by openssl to decrypt GCS credentials file - COVERITY_SCAN_TOKEN - Token to allow coverity test analysis uploads diff --git a/packaging/docker/README.md b/packaging/docker/README.md index 93272295d2..9259a341da 100644 --- a/packaging/docker/README.md +++ b/packaging/docker/README.md @@ -130,7 +130,7 @@ You can restrict access by following [official caddy guide](https://caddyserver. The script `packaging/docker/build-test.sh` can be used to create an image and upload it to a repository of your choosing. ``` -Usage: packaging/docker/build-test.sh -r <REPOSITORY> -v <VERSION> -u <DOCKER_USERNAME> -p <DOCKER_PASSWORD> [-s] +Usage: packaging/docker/build-test.sh -r <REPOSITORY> -v <VERSION> -u <DOCKER_USERNAME> -p <DOCKER_PASS> [-s] -s skip build, just push the image Builds an amd64 image and pushes it to the docker hub repository REPOSITORY ``` @@ -155,4 +155,4 @@ We check out PR5576 and run the following: Then we can run `helm install [path to our helmchart clone]`. -If we make changes to the code, we execute the same `build-test.sh` command, followed by `helm upgrade [name] [path to our helmchart clone]`
\ No newline at end of file +If we make changes to the code, we execute the same `build-test.sh` command, followed by `helm upgrade [name] [path to our helmchart clone]` diff --git a/packaging/docker/build-test.sh b/packaging/docker/build-test.sh index c43dd7bdf7..9bb3d01554 100755 --- a/packaging/docker/build-test.sh +++ b/packaging/docker/build-test.sh @@ -8,7 +8,7 @@ # Author : Pavlos Emm. Katsoulakis (paul@netdata.cloud) printhelp() { - echo "Usage: packaging/docker/build-test.sh -r <REPOSITORY> -v <VERSION> -u <DOCKER_USERNAME> -p <DOCKER_PASSWORD> [-s] + echo "Usage: packaging/docker/build-test.sh -r <REPOSITORY> -v <VERSION> -u <DOCKER_USERNAME> -p <DOCKER_PASS> [-s] -s skip build, just push the image Builds an amd64 image and pushes it to the docker hub repository REPOSITORY" } @@ -34,7 +34,7 @@ do DOCKER_USERNAME=$OPTARG ;; p) - DOCKER_PASSWORD=$OPTARG + DOCKER_PASS=$OPTARG ;; s) DOBUILD=0 @@ -46,7 +46,7 @@ do esac done -if [ -n "${REPOSITORY}" ] && [ -n "${VERSION}" ] && [ -n "${DOCKER_USERNAME}" ] && [ -n "${DOCKER_PASSWORD}" ] ; then +if [ -n "${REPOSITORY}" ] && [ -n "${VERSION}" ] && [ -n "${DOCKER_USERNAME}" ] && [ -n "${DOCKER_PASS}" ] ; then if [ $DOBUILD -eq 1 ] ; then echo "Building ${VERSION} of ${REPOSITORY} container" docker run --rm --privileged multiarch/qemu-user-static:register --reset @@ -61,12 +61,12 @@ if [ -n "${REPOSITORY}" ] && [ -n "${VERSION}" ] && [ -n "${DOCKER_USERNAME}" ] # Login to docker hub to allow futher operations echo "Logging into docker" - echo "$DOCKER_PASSWORD" | docker --config /tmp/docker login -u "$DOCKER_USERNAME" --password-stdin + echo "$DOCKER_PASS" | docker --config /tmp/docker login -u "$DOCKER_USERNAME" --password-stdin echo "Pushing ${REPOSITORY}:${VERSION}" docker --config /tmp/docker push "${REPOSITORY}:${VERSION}" else - echo "Missing parameter. REPOSITORY=${REPOSITORY} VERSION=${VERSION} DOCKER_USERNAME=${DOCKER_USERNAME} DOCKER_PASSWORD=${DOCKER_PASSWORD}" + echo "Missing parameter. REPOSITORY=${REPOSITORY} VERSION=${VERSION} DOCKER_USERNAME=${DOCKER_USERNAME} DOCKER_PASS=${DOCKER_PASS}" printhelp exit 1 fi diff --git a/packaging/docker/publish.sh b/packaging/docker/publish.sh index 36a49283d6..23263cea50 100755 --- a/packaging/docker/publish.sh +++ b/packaging/docker/publish.sh @@ -37,7 +37,7 @@ fi MANIFEST_LIST="${REPOSITORY}:${VERSION}" # There is no reason to continue if we cannot log in to docker hub -if [ -z ${DOCKER_USERNAME+x} ] || [ -z ${DOCKER_PASSWORD+x} ]; then +if [ -z ${DOCKER_USERNAME+x} ] || [ -z ${DOCKER_PASS+x} ]; then echo "No docker hub username or password found, aborting without publishing" exit 1 fi @@ -61,7 +61,7 @@ echo "Manifest list : ${MANIFEST_LIST}" echo '{"experimental":"enabled"}' > "${WORKDIR}"/config.json # Login to docker hub to allow futher operations -echo "$DOCKER_PASSWORD" | $DOCKER_CMD login -u "$DOCKER_USERNAME" --password-stdin +echo "$DOCKER_PASS" | $DOCKER_CMD login -u "$DOCKER_USERNAME" --password-stdin # Push images to registry for ARCH in ${ARCHS[@]}; do |