mirror of
https://github.com/ViViDboarder/bitwarden_rs_ldap.git
synced 2024-11-21 10:46:27 +00:00
Update compose to use plugin rather than old compose
This commit is contained in:
parent
6ebe317986
commit
95ce406c69
18
Makefile
18
Makefile
@ -36,22 +36,22 @@ test:
|
||||
# Run bootstrapped integration test
|
||||
.PHONY: itest-up
|
||||
itest-up:
|
||||
docker-compose -f docker-compose.yml \
|
||||
docker compose -f docker-compose.yml \
|
||||
-f itest/docker-compose.itest.yml \
|
||||
build
|
||||
docker-compose -f docker-compose.yml \
|
||||
docker compose -f docker-compose.yml \
|
||||
-f itest/docker-compose.itest.yml \
|
||||
up -d vaultwarden ldap
|
||||
|
||||
.PHONY: itest-run
|
||||
itest-run:
|
||||
docker-compose -f docker-compose.yml \
|
||||
docker compose -f docker-compose.yml \
|
||||
-f itest/docker-compose.itest.yml \
|
||||
run ldap_sync
|
||||
|
||||
.PHONY: itest-stop
|
||||
itest-stop:
|
||||
docker-compose stop
|
||||
docker compose stop
|
||||
|
||||
.PHONY: itest
|
||||
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
|
||||
.PHONY: itest-env
|
||||
itest-env:
|
||||
docker-compose -f docker-compose.yml \
|
||||
docker compose -f docker-compose.yml \
|
||||
-f itest/docker-compose.itest-env.yml \
|
||||
build
|
||||
docker-compose -f docker-compose.yml \
|
||||
docker compose -f docker-compose.yml \
|
||||
-f itest/docker-compose.itest-env.yml \
|
||||
up -d vaultwarden ldap
|
||||
docker-compose -f docker-compose.yml \
|
||||
docker compose -f docker-compose.yml \
|
||||
-f itest/docker-compose.itest-env.yml \
|
||||
run ldap_sync
|
||||
docker-compose stop
|
||||
docker compose stop
|
||||
|
||||
.PHONY: clean-itest
|
||||
clean-itest:
|
||||
docker-compose down -v
|
||||
docker compose down -v
|
||||
|
||||
# Installs pre-commit hooks
|
||||
.PHONY: install-hooks
|
||||
|
@ -1,5 +1,4 @@
|
||||
---
|
||||
version: '3'
|
||||
services:
|
||||
ldap_sync:
|
||||
build:
|
||||
|
@ -1,5 +1,4 @@
|
||||
---
|
||||
version: '3'
|
||||
services:
|
||||
ldap_sync:
|
||||
environment:
|
||||
|
@ -1,5 +1,4 @@
|
||||
---
|
||||
version: '3'
|
||||
services:
|
||||
ldap_sync:
|
||||
volumes:
|
||||
|
Loading…
Reference in New Issue
Block a user