feat: upgraded to v 2-0

This commit is contained in:
Giles Bradshaw 2020-10-22 16:52:10 +01:00
parent e0ee8fa23a
commit 13a5e94537
4 changed files with 5 additions and 2 deletions

View File

@ -13,6 +13,7 @@ local register = import 'node_modules/@sigyl/jsonnet-drone/register.libsonnet';
publicSecrets, publicSecrets,
secretSecrets, secretSecrets,
[ [
'DOMAIN',
'REGISTRY_DOMAIN', 'REGISTRY_DOMAIN',
'REGISTRY_PORT', 'REGISTRY_PORT',
'REGISTRY_PASSWORD', 'REGISTRY_PASSWORD',

View File

@ -81,6 +81,7 @@ steps:
- drone_build_number - drone_build_number
- drone_repo_name - drone_repo_name
- drone_repo_namespace - drone_repo_namespace
- domain
- registry_domain - registry_domain
- registry_port - registry_port
- registry_password - registry_password
@ -89,6 +90,7 @@ steps:
passphrase: ${SSH_PASSPHRASE} passphrase: ${SSH_PASSPHRASE}
port: ${SSH_PORT} port: ${SSH_PORT}
script: script:
- export DOMAIN=$${DOMAIN}
- export REGISTRY_DOMAIN=$${REGISTRY_DOMAIN} - export REGISTRY_DOMAIN=$${REGISTRY_DOMAIN}
- export REGISTRY_PORT=$${REGISTRY_PORT} - export REGISTRY_PORT=$${REGISTRY_PORT}
- export REGISTRY_PASSWORD=$${REGISTRY_PASSWORD} - export REGISTRY_PASSWORD=$${REGISTRY_PASSWORD}

View File

@ -1,6 +1,6 @@
{ {
"private": true, "private": true,
"dependencies": { "dependencies": {
"@sigyl/jsonnet-drone": "^0.1.0" "@sigyl/jsonnet-drone": "^0.4.0"
} }
} }

View File

@ -1,7 +1,7 @@
version: "3.7" version: "3.7"
services: services:
portainer: 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 tcp://tasks.portainer-agent:9001 --tlsskipverify
# command: -H unix:///var/run/docker.sock # command: -H unix:///var/run/docker.sock
deploy: deploy: