[ci skip] netdata/packaging/ci: Emergent replacement of docker credentials (Skipping PR due to nature of event)
Pavlos Emm. Katsoulakis committed
Apr 29, 2019 at 00:02 UTC
2e7b4dab71346c6a4dfa66f99166b13de9161462
4 files changed
+9
-9
.travis/README.md
+1
-1
@@ -4,7 +4,7 @@
4
5
- GITHUB_TOKEN - GitHub token with push access to repository
6
- DOCKER_USERNAME - Username (netdatabot) with write access to docker hub repository
7
-- DOCKER_PASS - Password to docker hub
7
+- DOCKER_PWD - Password to docker hub
8
- encrypted_8daf19481253_key - key needed by openssl to decrypt GCS credentials file
9
- encrypted_8daf19481253_iv - IV needed by openssl to decrypt GCS credentials file
10
- COVERITY_SCAN_TOKEN - Token to allow coverity test analysis uploads
packaging/docker/README.md
+1
-1
@@ -130,7 +130,7 @@ You can restrict access by following [official caddy guide](https://caddyserver.
130
The script `packaging/docker/build-test.sh` can be used to create an image and upload it to a repository of your choosing.
131
132
```
133
-Usage: packaging/docker/build-test.sh -r <REPOSITORY> -v <VERSION> -u <DOCKER_USERNAME> -p <DOCKER_PASS> [-s]
133
+Usage: packaging/docker/build-test.sh -r <REPOSITORY> -v <VERSION> -u <DOCKER_USERNAME> -p <DOCKER_PWD> [-s]
134
-s skip build, just push the image
135
Builds an amd64 image and pushes it to the docker hub repository REPOSITORY
136
```
packaging/docker/build-test.sh
+5
-5
@@ -8,7 +8,7 @@
8
# Author : Pavlos Emm. Katsoulakis (paul@netdata.cloud)
9
10
printhelp() {
11
- echo "Usage: packaging/docker/build-test.sh -r <REPOSITORY> -v <VERSION> -u <DOCKER_USERNAME> -p <DOCKER_PASS> [-s]
11
+ echo "Usage: packaging/docker/build-test.sh -r <REPOSITORY> -v <VERSION> -u <DOCKER_USERNAME> -p <DOCKER_PWD> [-s]
12
-s skip build, just push the image
13
Builds an amd64 image and pushes it to the docker hub repository REPOSITORY"
14
}
@@ -34,7 +34,7 @@ do
34
DOCKER_USERNAME=$OPTARG
35
;;
36
p)
37
- DOCKER_PASS=$OPTARG
37
+ DOCKER_PWD=$OPTARG
38
;;
39
s)
40
DOBUILD=0
@@ -46,7 +46,7 @@ do
46
esac
47
done
48
49
-if [ -n "${REPOSITORY}" ] && [ -n "${VERSION}" ] && [ -n "${DOCKER_USERNAME}" ] && [ -n "${DOCKER_PASS}" ] ; then
49
+if [ -n "${REPOSITORY}" ] && [ -n "${VERSION}" ] && [ -n "${DOCKER_USERNAME}" ] && [ -n "${DOCKER_PWD}" ] ; then
50
if [ $DOBUILD -eq 1 ] ; then
51
echo "Building ${VERSION} of ${REPOSITORY} container"
52
docker run --rm --privileged multiarch/qemu-user-static:register --reset
@@ -61,12 +61,12 @@ if [ -n "${REPOSITORY}" ] && [ -n "${VERSION}" ] && [ -n "${DOCKER_USERNAME}" ]
61
62
# Login to docker hub to allow futher operations
63
echo "Logging into docker"
64
- echo "$DOCKER_PASS" | docker --config /tmp/docker login -u "$DOCKER_USERNAME" --password-stdin
64
+ echo "$DOCKER_PWD" | docker --config /tmp/docker login -u "$DOCKER_USERNAME" --password-stdin
65
66
echo "Pushing ${REPOSITORY}:${VERSION}"
67
docker --config /tmp/docker push "${REPOSITORY}:${VERSION}"
68
else
69
- echo "Missing parameter. REPOSITORY=${REPOSITORY} VERSION=${VERSION} DOCKER_USERNAME=${DOCKER_USERNAME} DOCKER_PASS=${DOCKER_PASS}"
69
+ echo "Missing parameter. REPOSITORY=${REPOSITORY} VERSION=${VERSION} DOCKER_USERNAME=${DOCKER_USERNAME} DOCKER_PWD=${DOCKER_PWD}"
70
printhelp
71
exit 1
72
fi
packaging/docker/publish.sh
+2
-2
@@ -46,7 +46,7 @@ fi
46
MANIFEST_LIST="${REPOSITORY}:${VERSION}"
47
48
# There is no reason to continue if we cannot log in to docker hub
49
-if [ -z ${DOCKER_USERNAME+x} ] || [ -z ${DOCKER_PASS+x} ]; then
49
+if [ -z ${DOCKER_USERNAME+x} ] || [ -z ${DOCKER_PWD+x} ]; then
50
echo "No docker hub username or password found, aborting without publishing"
51
exit 1
52
fi
@@ -70,7 +70,7 @@ echo "Manifest list : ${MANIFEST_LIST}"
70
echo '{"experimental":"enabled"}' > "${WORKDIR}"/config.json
71
72
# Login to docker hub to allow futher operations
73
-echo "$DOCKER_PASS" | $DOCKER_CMD login -u "$DOCKER_USERNAME" --password-stdin
73
+echo "$DOCKER_PWD" | $DOCKER_CMD login -u "$DOCKER_USERNAME" --password-stdin
74
75
# Push images to registry
76
for ARCH in ${ARCHS[@]}; do