.
This commit is contained in:
parent
d059da156d
commit
dc65bfb7c7
|
@ -1,4 +1,5 @@
|
||||||
docker stack rm guacamole
|
export LOCAL_DOCKER_REGISTRY=${REGISTRY_DOMAIN}:${REGISTRY_PORT}/ \
|
||||||
echo 'sleeping...zzz'
|
&& docker stack rm guacamole \
|
||||||
sleep 60
|
&& echo 'sleeping...zzz' \
|
||||||
docker stack deploy -c docker-compose.yml guacamole
|
&& sleep 60 \
|
||||||
|
&& docker stack deploy -c docker-compose.yml guacamole \
|
||||||
|
|
|
@ -1,12 +1,32 @@
|
||||||
|
|
||||||
local secretSecrets = import 'lib/secret-secrets.libsonnet';
|
local secretSecrets = import 'lib/secret-secrets.libsonnet';
|
||||||
local publicSecrets = import 'lib/public-secrets.libsonnet';
|
local publicSecrets = import 'lib/public-secrets.libsonnet';
|
||||||
|
|
||||||
local deploy = import 'node_modules/@sigyl/jsonnet-drone/deploy.libsonnet';
|
local deploy = import 'node_modules/@sigyl/jsonnet-drone/deploy.libsonnet';
|
||||||
local register = import 'node_modules/@sigyl/jsonnet-drone/register.libsonnet';
|
local register = import 'node_modules/@sigyl/jsonnet-drone/register.libsonnet';
|
||||||
|
local registry = import 'node_modules/@sigyl/jsonnet-drone/registry.libsonnet';
|
||||||
|
|
||||||
|
local config = {
|
||||||
|
registry: '',
|
||||||
|
};
|
||||||
|
|
||||||
[
|
[
|
||||||
register,
|
register,
|
||||||
deploy(
|
registry(
|
||||||
|
config {
|
||||||
|
script: 'sh .drone/scripts/initialise-images.sh',
|
||||||
|
secrets: [],
|
||||||
|
},
|
||||||
|
) {
|
||||||
|
trigger +: {
|
||||||
|
event +: [
|
||||||
|
'promote',
|
||||||
|
],
|
||||||
|
target +: [
|
||||||
|
'registry',
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
deploy(config)(
|
||||||
'guacamole',
|
'guacamole',
|
||||||
'/stack/',
|
'/stack/',
|
||||||
[],
|
[],
|
||||||
|
|
|
@ -15,6 +15,52 @@ trigger:
|
||||||
exclude:
|
exclude:
|
||||||
- promote
|
- promote
|
||||||
|
|
||||||
|
---
|
||||||
|
kind: pipeline
|
||||||
|
type: docker
|
||||||
|
name: registry
|
||||||
|
|
||||||
|
platform:
|
||||||
|
os: linux
|
||||||
|
arch: amd64
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: "dockerpull and save docker images:"
|
||||||
|
image: docker:19.03.12-dind@sha256:8dded163e463f4a59bf305b3dca98e312b2cfb89a43da3872e48f95a7554c48f
|
||||||
|
commands:
|
||||||
|
- set -e
|
||||||
|
- export REGISTRY=$${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/
|
||||||
|
- sh .drone/scripts/initialise-images.sh $${REGISTRY} $${REGISTRY_PASSWORD}
|
||||||
|
volumes:
|
||||||
|
- name: dockersock
|
||||||
|
path: /var/run
|
||||||
|
|
||||||
|
services:
|
||||||
|
- name: docker
|
||||||
|
image: docker:19.03.12-dind@sha256:8dded163e463f4a59bf305b3dca98e312b2cfb89a43da3872e48f95a7554c48f
|
||||||
|
privileged: true
|
||||||
|
volumes:
|
||||||
|
- name: dockersock
|
||||||
|
path: /var/run
|
||||||
|
- name: ca
|
||||||
|
path: /etc/docker/certs.d
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
- name: dockersock
|
||||||
|
temp: {}
|
||||||
|
- name: ca
|
||||||
|
host:
|
||||||
|
path: /etc/docker/certs.d
|
||||||
|
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
|
|
||||||
|
trigger:
|
||||||
|
event:
|
||||||
|
- promote
|
||||||
|
target:
|
||||||
|
- registry
|
||||||
|
|
||||||
---
|
---
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
type: docker
|
type: docker
|
||||||
|
|
|
@ -4,6 +4,6 @@
|
||||||
"build": "drone jsonnet --source drone-home.jsonnet --target drone-home.yml --stream"
|
"build": "drone jsonnet --source drone-home.jsonnet --target drone-home.yml --stream"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@sigyl/jsonnet-drone": "^0.1.1"
|
"@sigyl/jsonnet-drone": "^0.3.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,15 @@
|
||||||
|
n=0
|
||||||
|
while :
|
||||||
|
do
|
||||||
|
docker pull $2 \
|
||||||
|
&& docker tag $2 $1$2 \
|
||||||
|
&& docker push $1$2 && break # substitute your command here
|
||||||
|
n=$((n+1))
|
||||||
|
if [ $n -ge 10 ]; then
|
||||||
|
echo "initialise failed"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "retrying..$n"
|
||||||
|
sleep 5
|
||||||
|
done
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
sh $(dirname $0)/login.sh $1 "$2" \
|
||||||
|
&& sh $(dirname $0)/initialise-image.sh $1 postgres:12.4 \
|
||||||
|
&& sh $(dirname $0)/initialise-image.sh $1 guacamole/guacd:1.2.0 \
|
||||||
|
&& sh $(dirname $0)/initialise-image.sh $1 guacamole/guacamole:1.2.0
|
|
@ -0,0 +1,13 @@
|
||||||
|
n=0
|
||||||
|
while :
|
||||||
|
do
|
||||||
|
docker login $1 --username client --password $2 \
|
||||||
|
&& break # substitute your command here
|
||||||
|
n=$((n+1))
|
||||||
|
if [ $n -ge 10 ]; then
|
||||||
|
echo "login failed"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "retrying login..$n"
|
||||||
|
sleep 5
|
||||||
|
done
|
|
@ -12,10 +12,10 @@
|
||||||
resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone-environment/-/jsonnet-drone-environment-0.0.5.tgz#9ea85e08904777bd21a3e4b30b0b91461d0285ff"
|
resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone-environment/-/jsonnet-drone-environment-0.0.5.tgz#9ea85e08904777bd21a3e4b30b0b91461d0285ff"
|
||||||
integrity sha512-xVGmdMO1pOyozAWUbJm6mzKBgsLPJ+1hWnGCK3AxPkr7kkDh18hu30+TLzlcQtqq76s5jUfvJUztezsGj/mIcw==
|
integrity sha512-xVGmdMO1pOyozAWUbJm6mzKBgsLPJ+1hWnGCK3AxPkr7kkDh18hu30+TLzlcQtqq76s5jUfvJUztezsGj/mIcw==
|
||||||
|
|
||||||
"@sigyl/jsonnet-drone@^0.1.1":
|
"@sigyl/jsonnet-drone@^0.3.1":
|
||||||
version "0.1.1"
|
version "0.3.1"
|
||||||
resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-0.1.1.tgz#37afda650e8420a664e89c762236a1e59aa485d9"
|
resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-0.3.1.tgz#790a83f45556cc613f07fbc98ca760027fa936e7"
|
||||||
integrity sha512-GR7LXYaUJYjkcWRyyLlwrBX9Jw04Vlcc/XS32rNaSz4wtrD9opvnmESxNC1UTWXsT/3ybuQhLhCboEb2GiTWmw==
|
integrity sha512-FiSyunjR0Udc20I2gA6gkzX3sCB2dPq/ZODrXcm7ROQFKF2Wr4b+xhpovjEdnjKGy8G4d+rRcdN+Jyhp7WQLEg==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@sigyl/jsonnet-compose" "^0.0.2"
|
"@sigyl/jsonnet-compose" "^0.0.2"
|
||||||
"@sigyl/jsonnet-drone-environment" "0.0.5"
|
"@sigyl/jsonnet-drone-environment" "0.0.5"
|
||||||
|
|
|
@ -8,7 +8,7 @@ services:
|
||||||
replicas: 1
|
replicas: 1
|
||||||
restart_policy:
|
restart_policy:
|
||||||
condition: any
|
condition: any
|
||||||
image: ${REGISTRY_DOMAIN}:${REGISTRY_PORT}/guacamole-postgresql:latest
|
image: ${LOCAL_DOCKER_REGISTRY}guacamole-postgresql:latest
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
||||||
POSTGRES_DB: guacamole_db
|
POSTGRES_DB: guacamole_db
|
||||||
|
@ -24,7 +24,7 @@ services:
|
||||||
replicas: 1
|
replicas: 1
|
||||||
restart_policy:
|
restart_policy:
|
||||||
condition: any
|
condition: any
|
||||||
image: guacamole/guacd:latest
|
image: ${LOCAL_DOCKER_REGISTRY}guacamole/guacd:1.2.0
|
||||||
networks:
|
networks:
|
||||||
- appnet
|
- appnet
|
||||||
|
|
||||||
|
@ -35,7 +35,8 @@ services:
|
||||||
replicas: 1
|
replicas: 1
|
||||||
restart_policy:
|
restart_policy:
|
||||||
condition: any
|
condition: any
|
||||||
image: guacamole/guacamole:1.2.0@sha256:6eb0b854e8e145df8f9220b92e51d52e9ff18c4262de20d56ccc62a4dad835b9
|
image: ${LOCAL_DOCKER_REGISTRY}guacamole/guacamole:1.2.0
|
||||||
|
#@sha256:6eb0b854e8e145df8f9220b92e51d52e9ff18c4262de20d56ccc62a4dad835b9
|
||||||
environment:
|
environment:
|
||||||
- POSTGRES_HOSTNAME=guacamole-postgresql
|
- POSTGRES_HOSTNAME=guacamole-postgresql
|
||||||
- POSTGRES_PORT=5432
|
- POSTGRES_PORT=5432
|
||||||
|
|
|
@ -1,2 +1,4 @@
|
||||||
FROM postgres:12.4@sha256:b0cfe264cb1143c7c660ddfd5c482464997d62d6bc9f97f8fdf3deefce881a8c
|
ARG REGISTRY
|
||||||
|
FROM ${REGISTRY}postgres:12.4
|
||||||
|
# @sha256:b0cfe264cb1143c7c660ddfd5c482464997d62d6bc9f97f8fdf3deefce881a8c
|
||||||
COPY *.sql /
|
COPY *.sql /
|
Loading…
Reference in New Issue