Commit e4932ff3 authored by Sascha Pfeiffer's avatar Sascha Pfeiffer

bugfix

Signed-off-by: default avatarSascha Pfeiffer <sascha.pfeiffer@psono.com>
parent 0da39390
......@@ -53,6 +53,7 @@ docker-image:
- docker build -t $CONTAINER_TEST_IMAGE .
- docker push $CONTAINER_TEST_IMAGE
firefox-extension:
except:
- schedules
......@@ -71,6 +72,7 @@ firefox-extension:
paths:
- ./*
chrome-extension:
except:
- schedules
......@@ -89,6 +91,7 @@ chrome-extension:
paths:
- ./*
webclient:
except:
- schedules
......@@ -107,6 +110,7 @@ webclient:
paths:
- ./*
release-docker:
except:
- schedules
......@@ -125,6 +129,7 @@ release-docker:
only:
- /^v[0-9]*\.[0-9]*\.[0-9]*$/
deploy-security-scan-image:
except:
- schedules
......@@ -133,7 +138,12 @@ deploy-security-scan-image:
services:
- docker:dind
script:
- sh ./var/deploy_security_scan_image.sh
- docker info
- echo $artifactory_credentials | docker login --username=gitlab --password-stdin psono-docker-local.jfrog.io
- echo $docker_hub_credentials | docker login --username=psonogitlab --password-stdin
- docker pull $CONTAINER_TEST_IMAGE
- docker tag $CONTAINER_TEST_IMAGE psono/security-scans:psono-client-ce-$CI_BUILD_REF_NAME
- docker push psono/security-scans:psono-client-ce-$CI_BUILD_REF_NAME
deploy:
......@@ -144,6 +154,8 @@ deploy:
services:
- docker:dind
script:
- echo $artifactory_credentials | docker login --username=gitlab --password-stdin psono-docker-local.jfrog.io
- echo $docker_hub_credentials | docker login --username=psonogitlab --password-stdin
- sh ./var/deploy.sh
environment:
name: production
......
......@@ -3,19 +3,6 @@ apk add --update curl
# Pull docker container here, as the login will be overwritten in the next step
docker pull psono-docker-local.jfrog.io/psono/psono-client:latest
# Deploy to Docker Hub
mkdir -p /root/.docker
cat > /root/.docker/config.json <<- "EOF"
{
"auths": {
"https://index.docker.io/v1/": {
"auth": "docker_hub_credentials"
}
}
}
EOF
sed -i 's/docker_hub_credentials/'"$docker_hub_credentials"'/g' /root/.docker/config.json
docker tag psono-docker-local.jfrog.io/psono/psono-client:latest psono/psono-client:latest
docker push psono/psono-client:latest
......
#!/usr/bin/env bash
# Pull docker container here, as the login will be overwritten in the next step
docker pull $CONTAINER_TEST_IMAGE
# Deploy to Docker Hub
mkdir -p /root/.docker
cat > /root/.docker/config.json <<- "EOF"
{
"auths": {
"https://index.docker.io/v1/": {
"auth": "docker_hub_credentials"
}
}
}
EOF
sed -i 's/docker_hub_credentials/'"$docker_hub_credentials"'/g' /root/.docker/config.json
docker tag $CONTAINER_TEST_IMAGE psono/security-scans:psono-client-ce-$CI_BUILD_REF_NAME
docker push psono/security-scans:psono-client-ce-$CI_BUILD_REF_NAME
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment