diff options
| -rw-r--r-- | .github/workflows/build-and-deploy.yml | 6 | ||||
| -rw-r--r-- | deploy/inventory.yml | 14 | ||||
| -rw-r--r-- | deploy/playbook.yml | 12 |
3 files changed, 15 insertions, 17 deletions
diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index e3bacd2..ffb81c5 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -77,6 +77,6 @@ jobs: ansible-playbook -i inventory.yml -l stage playbook.yml --private-key ~/.ssh/id_ed25519 -u svc_github - -e saya_today_web.b2.key_id=${{ secrets.B2_KEY_ID }} - -e saya_today_web.b2.application_key=${{ secrets.B2_APPLICATION_KEY }} - -e saya_today_web.tag=${{ github.ref_name }} + -e saya_today_web_b2_key_id=${{ secrets.B2_KEY_ID }} + -e saya_today_web_b2_application_key=${{ secrets.B2_APPLICATION_KEY }} + -e saya_today_web_tag=${{ github.ref_name }} diff --git a/deploy/inventory.yml b/deploy/inventory.yml index 5c88365..3c1220d 100644 --- a/deploy/inventory.yml +++ b/deploy/inventory.yml @@ -3,15 +3,13 @@ all: prod: hosts: pl.saya.today: - saya_today_web: - name: sayana-web - hostname: sayana-web - ipv4_address: 172.16.0.18 + saya_today_web_name: sayana-web + saya_today_web_hostname: sayana-web + saya_today_web_ipv4_address: 172.16.0.18 stage: hosts: pl.saya.today: - saya_today_web: - name: sayana-demo - hostname: sayana-demo - ipv4_address: 172.16.0.17 + saya_today_web_name: sayana-demo + saya_today_web_hostname: sayana-demo + saya_today_web_ipv4_address: 172.16.0.17 diff --git a/deploy/playbook.yml b/deploy/playbook.yml index c126f23..caeb8ef 100644 --- a/deploy/playbook.yml +++ b/deploy/playbook.yml @@ -6,16 +6,16 @@ tasks: - name: Deploy saya-today-web Docker Container community.docker.docker_container: - name: "{{ saya_today_web.name }}" - hostname: "{{ saya_today_web.hostname }}" - image: "ghcr.io/sayaandy/saya-today-web:{{ saya_today_web.tag }}" + name: "{{ saya_today_web_name }}" + hostname: "{{ saya_today_web_hostname }}" + image: "ghcr.io/sayaandy/saya-today-web:{{ saya_today_web_tag }}" env: - B2_KEY_ID: "{{ saya_today_web.b2.key_id }}" - B2_APPLICATION_KEY: "{{ saya_today_web.b2.application_key }}" + B2_KEY_ID: "{{ saya_today_web_b2_key_id }}" + B2_APPLICATION_KEY: "{{ saya_today_web_b2_application_key }}" network_mode: caddy networks: - name: caddy - ipv4_address: "{{ saya_today_web.ipv4_address }}" + ipv4_address: "{{ saya_today_web_ipv4_address }}" restart_policy: unless-stopped no_log: true ... |