test alternative login approach
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Change-Id: I2751d51edee7a3159b858efb687ada5988df9b8a
diff --git a/ci-dockerfiles-deployment.yaml b/ci-dockerfiles-deployment.yaml
index 28e034c..617b4d0 100644
--- a/ci-dockerfiles-deployment.yaml
+++ b/ci-dockerfiles-deployment.yaml
@@ -52,10 +52,6 @@
sequential: false
wrappers:
- timestamps
- - copy-to-slave:
- includes:
- - config.json
- relative-to: 'somewhereElse'
- credentials-binding:
- text:
credential-id: DOCKER_AUTH
diff --git a/ci-dockerfiles-deployment/config.json b/ci-dockerfiles-deployment/config.json
deleted file mode 100644
index a60b52b..0000000
--- a/ci-dockerfiles-deployment/config.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "auths": {
- "https://index.docker.io/v1/": {
- "auth": "${DOCKER_AUTH}"
- }
- }
-}
diff --git a/ci-dockerfiles-deployment/publish.sh b/ci-dockerfiles-deployment/publish.sh
index 9d71f3e..e196a16 100644
--- a/ci-dockerfiles-deployment/publish.sh
+++ b/ci-dockerfiles-deployment/publish.sh
@@ -13,7 +13,15 @@
docker_log_in()
{
mkdir -p ${HOME}/.docker
- sed -e "s|\${DOCKER_AUTH}|${DOCKER_AUTH}|" < ${WORKSPACE}/config.json > ${HOME}/.docker/config.json
+ cat > ${HOME}/.docker/config.json << EOF
+{
+ "auths": {
+ "https://index.docker.io/v1/": {
+ "auth": "${DOCKER_AUTH}"
+ }
+ }
+}
+EOF
chmod 0600 ${HOME}/.docker/config.json
}
diff --git a/ci-dockerfiles-sanity-check.yaml b/ci-dockerfiles-sanity-check.yaml
index 4699910..a677426 100644
--- a/ci-dockerfiles-sanity-check.yaml
+++ b/ci-dockerfiles-sanity-check.yaml
@@ -54,10 +54,6 @@
sequential: false
wrappers:
- timestamps
- - copy-to-slave:
- includes:
- - config.json
- relative-to: 'somewhereElse'
builders:
- shell: |
#!/bin/bash -e