Merge branch 'staging' into dev

This commit is contained in:
fl0ppy-d1sk 2024-03-07 17:45:25 +01:00
commit 0263c06cce
No known key found for this signature in database
GPG key ID: 93EE47CC3D061500
3 changed files with 7 additions and 4 deletions

View file

@ -42,7 +42,7 @@ jobs:
run: docker tag local/bunkerweb-tests:latest 192.168.42.100:5000/bunkerweb-tests:latest && docker push 192.168.42.100:5000/bunkerweb-tests:latest && docker tag local/scheduler-tests:latest 192.168.42.100:5000/scheduler-tests:latest && docker push 192.168.42.100:5000/scheduler-tests:latest && docker tag local/autoconf-tests:latest 192.168.42.100:5000/autoconf-tests:latest && docker push 192.168.42.100:5000/autoconf-tests:latest
if: inputs.TYPE == 'swarm'
- name: Install test dependencies
run: pip3 install --no-cache-dir --require-hashes --no-deps -r tests/requirements.txt
run: PIP_BREAK_SYSTEM_PACKAGES=1 pip3 install --no-cache-dir --require-hashes --no-deps -r tests/requirements.txt
- uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4
with:
name: tf-k8s

View file

@ -25,11 +25,14 @@
name:
- docker-ce
- docker-ce-cli
- containerd.io
- docker-buildx-plugin
- docker-compose-plugin
update_cache: yes
state: present
# - name: Install /usr/local/bin/docker-compose
# shell: curl -L https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose && chmod +x /usr/local/bin/docker-compose
- name: Symlink docker-compose
shell: ln -f -s /usr/libexec/docker/cli-plugins/docker-compose /usr/local/bin/docker-compose
- name: Add user to docker group
user:

View file

@ -18,7 +18,7 @@
name: docker
state: forcereinstall
executable: pip3
version: "7.0.0"
version: "6.1.3"
- name: Add IP address of all hosts to all hosts
lineinfile: