Skip to content

Commit

Permalink
try fixing failing CI
Browse files Browse the repository at this point in the history
  • Loading branch information
ldruschk committed Jul 9, 2024
1 parent 9d741a1 commit 4991403
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 18 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN apt-get install -y --no-install-recommends openssh-client rsync git less tmu
software-properties-common gpg-agent pipx # for ansible and packer install

# Poetry and Ansible
RUN pipx install poetry && pipx install --include-deps ansible && pipx inject ansible ansible-lint --include-apps --include-deps && pipx inject ansible docker
RUN pipx install poetry && pipx install --include-deps ansible && pipx inject ansible ansible-lint --include-apps --include-deps
ENV PATH="/root/.local/bin:${PATH}"

# Packer and Terraform
Expand Down
6 changes: 3 additions & 3 deletions ansible/roles/enoelk/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
dest: /services/EnoELK

- name: Pull ELK images
docker_compose:
pull: true
project_src: /services/EnoELK
shell: docker compose pull # noqa: command-instead-of-shell
args:
chdir: /services/EnoELK

- name: Allow wireguard input traffic (internal)
iptables:
Expand Down
12 changes: 6 additions & 6 deletions ansible/roles/enoengine/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
chdir: /services/EnoEngine

- name: Start EnoEngine Postgres
docker_compose:
state: present
project_src: /services/EnoEngine
shell: "docker compose up -d" # noqa: command-instead-of-shell
args:
chdir: /services/EnoEngine

- name: Clone EnoCTFPortal (for adhoc testing and solutions)
git: # noqa: latest
Expand All @@ -32,9 +32,9 @@
changed_when: false

- name: Start EnoCTFPortal
docker_compose:
state: present
project_src: /services/EnoCTFPortal
shell: "docker compose up -d" # noqa: command-instead-of-shell
args:
chdir: /services/EnoCTFPortal

- name: Allow flag submission traffic
iptables:
Expand Down
6 changes: 3 additions & 3 deletions ansible/roles/router_arkime/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
mode: "0644"

- name: Pull ES
docker_compose:
pull: true
project_src: /services/BambiArkimeElasticsearch
shell: docker compose pull # noqa: command-instead-of-shell
args:
chdir: /services/BambiArkimeElasticsearch

- name: Create /services/BambiArkime
file:
Expand Down
5 changes: 2 additions & 3 deletions ansible/roles/vuln_checkers/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,20 @@

- name: Clean local checker services cache
file:
delegate_to: localhost
module: file
path: ./services/{{ inventory_hostname }}/{{ item.key }}
state: absent
with_dict: "{{ vulnerable_services }}"
delegate_to: localhost

- name: Clone checkers services locally
become: false
git: # noqa: latest
delegate_to: localhost
repo: "{{ item.value }}"
dest: ./services/{{ inventory_hostname }}/{{ item.key }}
accept_hostkey: true
key_file: "{{ playbook_dir }}/../id_ed25519"
with_dict: "{{ vulnerable_services }}"
delegate_to: localhost

- name: Copy checkers to gameserver
synchronize:
Expand Down
4 changes: 2 additions & 2 deletions ansible/roles/vuln_services/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@
- name: Clean local services cache
become: false
file:
delegate_to: localhost
path: ./services/{{ inventory_hostname }}/dockered_vulnerable_services
state: absent
delegate_to: localhost

- name: Clone services locally
become: false
git: # noqa: latest
delegate_to: localhost
repo: "{{ item.value }}"
dest: ./services/{{ inventory_hostname }}/dockered_vulnerable_services/{{ item.key }}
key_file: "{{ playbook_dir }}/../id_ed25519"
accept_hostkey: true
with_dict: "{{ vulnerable_services }}"
delegate_to: localhost

- name: Copy services to vulnbox
synchronize:
Expand Down

0 comments on commit 4991403

Please sign in to comment.