From 13a5e94537dfa1aff64f529ba077e91ee4eb31ef Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Thu, 22 Oct 2020 16:52:10 +0100 Subject: [PATCH] feat: upgraded to v 2-0 --- .drone/drone-home.jsonnet | 1 + .drone/drone-home.yml | 2 ++ .drone/package.json | 2 +- docker-compose.yml | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.drone/drone-home.jsonnet b/.drone/drone-home.jsonnet index 2b9ca26..d59a915 100644 --- a/.drone/drone-home.jsonnet +++ b/.drone/drone-home.jsonnet @@ -13,6 +13,7 @@ local register = import 'node_modules/@sigyl/jsonnet-drone/register.libsonnet'; publicSecrets, secretSecrets, [ + 'DOMAIN', 'REGISTRY_DOMAIN', 'REGISTRY_PORT', 'REGISTRY_PASSWORD', diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml index 90233ad..a4e1617 100644 --- a/.drone/drone-home.yml +++ b/.drone/drone-home.yml @@ -81,6 +81,7 @@ steps: - drone_build_number - drone_repo_name - drone_repo_namespace + - domain - registry_domain - registry_port - registry_password @@ -89,6 +90,7 @@ steps: passphrase: ${SSH_PASSPHRASE} port: ${SSH_PORT} script: + - export DOMAIN=$${DOMAIN} - export REGISTRY_DOMAIN=$${REGISTRY_DOMAIN} - export REGISTRY_PORT=$${REGISTRY_PORT} - export REGISTRY_PASSWORD=$${REGISTRY_PASSWORD} diff --git a/.drone/package.json b/.drone/package.json index a484d06..8501e0b 100644 --- a/.drone/package.json +++ b/.drone/package.json @@ -1,6 +1,6 @@ { "private": true, "dependencies": { - "@sigyl/jsonnet-drone": "^0.1.0" + "@sigyl/jsonnet-drone": "^0.4.0" } } diff --git a/docker-compose.yml b/docker-compose.yml index a6554b5..f66ae8b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.7" services: portainer: - image: portainer/portainer:1.24.1-alpine@sha256:67821db9fefb08c0d0f073d04250ec57d4db25bfcd16c436618c08038b9dae33 + image: portainer/portainer-ce:2.0.0-alpine@sha256:5555e1538aa4bc56d7ae85787278e4b972573b205e2ae260717ef17985e0e24f command: -H tcp://tasks.portainer-agent:9001 --tlsskipverify # command: -H unix:///var/run/docker.sock deploy: