Update compose to use plugin rather than old compose

This commit is contained in:
ViViDboarder 2024-10-08 11:27:25 -07:00
parent 6ebe317986
commit 95ce406c69
4 changed files with 9 additions and 12 deletions

View File

@ -36,22 +36,22 @@ test:
# Run bootstrapped integration test # Run bootstrapped integration test
.PHONY: itest-up .PHONY: itest-up
itest-up: itest-up:
docker-compose -f docker-compose.yml \ docker compose -f docker-compose.yml \
-f itest/docker-compose.itest.yml \ -f itest/docker-compose.itest.yml \
build build
docker-compose -f docker-compose.yml \ docker compose -f docker-compose.yml \
-f itest/docker-compose.itest.yml \ -f itest/docker-compose.itest.yml \
up -d vaultwarden ldap up -d vaultwarden ldap
.PHONY: itest-run .PHONY: itest-run
itest-run: itest-run:
docker-compose -f docker-compose.yml \ docker compose -f docker-compose.yml \
-f itest/docker-compose.itest.yml \ -f itest/docker-compose.itest.yml \
run ldap_sync run ldap_sync
.PHONY: itest-stop .PHONY: itest-stop
itest-stop: itest-stop:
docker-compose stop docker compose stop
.PHONY: itest .PHONY: itest
itest: itest-up itest-run itest-stop itest: itest-up itest-run itest-stop
@ -59,20 +59,20 @@ itest: itest-up itest-run itest-stop
# Run bootstrapped integration test using env for config # Run bootstrapped integration test using env for config
.PHONY: itest-env .PHONY: itest-env
itest-env: itest-env:
docker-compose -f docker-compose.yml \ docker compose -f docker-compose.yml \
-f itest/docker-compose.itest-env.yml \ -f itest/docker-compose.itest-env.yml \
build build
docker-compose -f docker-compose.yml \ docker compose -f docker-compose.yml \
-f itest/docker-compose.itest-env.yml \ -f itest/docker-compose.itest-env.yml \
up -d vaultwarden ldap up -d vaultwarden ldap
docker-compose -f docker-compose.yml \ docker compose -f docker-compose.yml \
-f itest/docker-compose.itest-env.yml \ -f itest/docker-compose.itest-env.yml \
run ldap_sync run ldap_sync
docker-compose stop docker compose stop
.PHONY: clean-itest .PHONY: clean-itest
clean-itest: clean-itest:
docker-compose down -v docker compose down -v
# Installs pre-commit hooks # Installs pre-commit hooks
.PHONY: install-hooks .PHONY: install-hooks

View File

@ -1,5 +1,4 @@
--- ---
version: '3'
services: services:
ldap_sync: ldap_sync:
build: build:

View File

@ -1,5 +1,4 @@
--- ---
version: '3'
services: services:
ldap_sync: ldap_sync:
environment: environment:

View File

@ -1,5 +1,4 @@
--- ---
version: '3'
services: services:
ldap_sync: ldap_sync:
volumes: volumes: