From bf73cc8d17c970c6afbf8dc7e238452914cc64af Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Wed, 29 May 2024 12:45:28 +0200 Subject: [PATCH 1/4] Lets see how it works --- .github/workflows/cd.yml | 3 ++- ansible/site.yml | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index a1c946e83..96ee7e5fc 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -1,7 +1,7 @@ name: Continuous Deployment on: - push: + pull_request: branches: [ main ] jobs: @@ -64,3 +64,4 @@ jobs: --inventory ansible/inventories/staging --skip-tags skip_ci --verbose + --tags docker diff --git a/ansible/site.yml b/ansible/site.yml index 2352cb984..981240dae 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -23,11 +23,15 @@ - role: geerlingguy.pip pip_install_packages: - name: passlib + tags: + - docker - role: geerlingguy.docker docker_packages_state: latest vars: docker_users: - ansible + tags: + - docker - role: installation tags: - hundred-eyes From 4958fd9059363f6ebe823c58850df788da2523b4 Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Wed, 29 May 2024 12:53:05 +0200 Subject: [PATCH 2/4] Run installation step --- .github/workflows/cd.yml | 2 +- ansible/site.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 96ee7e5fc..23687bf76 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -64,4 +64,4 @@ jobs: --inventory ansible/inventories/staging --skip-tags skip_ci --verbose - --tags docker + --tags installation diff --git a/ansible/site.yml b/ansible/site.yml index 981240dae..839c20344 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -34,4 +34,4 @@ - docker - role: installation tags: - - hundred-eyes + - installation From db57f42bf426cb6cc5649d96a0f4e24410985b5f Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Wed, 29 May 2024 13:03:06 +0200 Subject: [PATCH 3/4] Upgrade to hotfix version --- ansible/requirements.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ansible/requirements.yml b/ansible/requirements.yml index b82048f6c..f803bbf08 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -6,5 +6,7 @@ roles: collections: - community.general -- community.docker +### community.docker hotfix version ### +- name: community.docker + version: 3.10.3 - devsec.hardening From 313f186a3de0aa1875409a241e675b5026615a62 Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Wed, 29 May 2024 13:12:11 +0200 Subject: [PATCH 4/4] Remove code creep --- .github/workflows/cd.yml | 3 +-- ansible/site.yml | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 23687bf76..a1c946e83 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -1,7 +1,7 @@ name: Continuous Deployment on: - pull_request: + push: branches: [ main ] jobs: @@ -64,4 +64,3 @@ jobs: --inventory ansible/inventories/staging --skip-tags skip_ci --verbose - --tags installation diff --git a/ansible/site.yml b/ansible/site.yml index 839c20344..2352cb984 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -23,15 +23,11 @@ - role: geerlingguy.pip pip_install_packages: - name: passlib - tags: - - docker - role: geerlingguy.docker docker_packages_state: latest vars: docker_users: - ansible - tags: - - docker - role: installation tags: - - installation + - hundred-eyes