From b58fe592c5197faf0f2c6e41ac19866339db0697 Mon Sep 17 00:00:00 2001 From: Meutel Date: Sat, 28 Sep 2019 08:58:21 +0200 Subject: [PATCH] fix ansible --- .ansible/deploy-draft.yml | 16 +++++++++++----- .drone.yml | 6 +++--- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.ansible/deploy-draft.yml b/.ansible/deploy-draft.yml index f04a6a1..442b00a 100644 --- a/.ansible/deploy-draft.yml +++ b/.ansible/deploy-draft.yml @@ -5,16 +5,22 @@ docker_container: name: "bouquins_draft_{{ draft_name }}" image: "reg.meutel.net/go-bouquins:{{ draft_name }}" - state: present + state: started recreate: yes labels: - traefik.enable: true - traefik.port: 8080 - traefik.docker.network: proxybackend + traefik.enable: 'true' + traefik.port: '9000' + traefik.docker.network: 'proxybackend' traefik.frontend.rule: "Host:{{ draft_name }}.bouquins.www.meutel.net" + traefik.frontend.entryPoints: http networks: - name: proxybackend + - name: proxybackend + purge_networks: yes volumes: - bouquins_draft:/root/data + register: deploy_out + + - debug: + msg: "{{ deploy_out.container }}" # vim:ft=ansible: diff --git a/.drone.yml b/.drone.yml index e9e405d..7f11ca7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -55,13 +55,13 @@ steps: - name: deploy-branch image: plugins/ansible:1 - environment: - draft_name: ${DRONE_BRANCH##feature/} settings: playbook: .ansible/deploy-draft.yml inventory: .ansible/inventory private_key: from_secret: drone_ssh_key + extra_vars: + - draft_name=${DRONE_BRANCH##feature/} when: branch: - feature/* @@ -73,6 +73,6 @@ trigger: --- kind: signature -hmac: 7a0b174d395933fd3e9826391addd09db9272668e77291f78d23528b370c1cf4 +hmac: 402ef53d245969c2df4d6ec14d51d3d9665856c8fa0ec8248755a209fb66ff36 ...