flywithu/kopano-docker
1
0
Fork 0
mirror of https://github.com/zokradonh/kopano-docker synced 2025-10-31 10:27:14 +00:00
Code Issues Releases Wiki Activity

rename COMPOSE_FILE to not conflict with the env setting for this (#173)

Browse Source 
Signed-off-by: Felix Bartels <felix@host-consultants.de>
This commit is contained in:
Felix Bartels 2019-06-07 22:00:03 +02:00 committed by GitHub
parent 02d12ff317
commit 787857e2f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Makefile
View File

@ -23,7 +23,7 @@ KOPANO_ZPUSH_REPOSITORY_URL := http://repo.z-hub.io/z-push:/final/Debian_9.0/
RELEASE_KEY_DOWNLOAD := 0 RELEASE_KEY_DOWNLOAD := 0
DOWNLOAD_COMMUNITY_PACKAGES := 1 DOWNLOAD_COMMUNITY_PACKAGES := 1
COMPOSE_FILE := docker-compose.yml DOCKERCOMPOSE_FILE := docker-compose.yml
TAG_FILE := build.tags TAG_FILE := build.tags
-include .env -include .env
export export
@ -334,27 +334,27 @@ check-scripts:
.PHONY: clean .PHONY: clean
clean: clean:
docker-compose -f $(COMPOSE_FILE) down -v --remove-orphans || true docker-compose -f $(DOCKERCOMPOSE_FILE) down -v --remove-orphans || true
.PHONY: test .PHONY: test
test: ## Build and start new containers for testing (also deletes existing data volumes). test: ## Build and start new containers for testing (also deletes existing data volumes).
docker-compose -f $(COMPOSE_FILE) down -v --remove-orphans || true docker-compose -f $(DOCKERCOMPOSE_FILE) down -v --remove-orphans || true
make build-all make build-all
docker-compose -f $(COMPOSE_FILE) build docker-compose -f $(DOCKERCOMPOSE_FILE) build
docker-compose -f $(COMPOSE_FILE) up -d docker-compose -f $(DOCKERCOMPOSE_FILE) up -d
docker-compose -f $(COMPOSE_FILE) ps docker-compose -f $(DOCKERCOMPOSE_FILE) ps
test-update-env: ## Recreate containers based on updated .env. test-update-env: ## Recreate containers based on updated .env.
docker-compose -f $(COMPOSE_FILE) up -d docker-compose -f $(DOCKERCOMPOSE_FILE) up -d
test-ci: ## Test if all containers start up test-ci: ## Test if all containers start up
docker-compose -f $(COMPOSE_FILE) -f tests/test-container.yml build docker-compose -f $(DOCKERCOMPOSE_FILE) -f tests/test-container.yml build
docker-compose -f $(COMPOSE_FILE) -f tests/test-container.yml up -d docker-compose -f $(DOCKERCOMPOSE_FILE) -f tests/test-container.yml up -d
docker-compose -f $(COMPOSE_FILE) -f tests/test-container.yml ps docker-compose -f $(DOCKERCOMPOSE_FILE) -f tests/test-container.yml ps
# TODO this just echos the exit code of the kopano_test container. if this is not 0 we should do something with it. # TODO this just echos the exit code of the kopano_test container. if this is not 0 we should do something with it.
docker wait kopano_test_1 docker wait kopano_test_1
docker logs --tail 10 kopano_test_1 docker logs --tail 10 kopano_test_1
docker-compose -f $(COMPOSE_FILE) -f tests/test-container.yml stop 2>/dev/null docker-compose -f $(DOCKERCOMPOSE_FILE) -f tests/test-container.yml stop 2>/dev/null
docker rm kopano_test_1 docker rm kopano_test_1
test-security: ## Scan containers with Trivy for known security risks (not part of CI workflow for now). test-security: ## Scan containers with Trivy for known security risks (not part of CI workflow for now).
@ -363,9 +363,9 @@ test-security: ## Scan containers with Trivy for known security risks (not part
rm $(TAG_FILE) rm $(TAG_FILE)
test-quick: ## Similar to test target, but does not delete existing data volumes and does not rebuild images. test-quick: ## Similar to test target, but does not delete existing data volumes and does not rebuild images.
docker-compose -f $(COMPOSE_FILE) stop || true docker-compose -f $(DOCKERCOMPOSE_FILE) stop || true
docker-compose -f $(COMPOSE_FILE) up -d docker-compose -f $(DOCKERCOMPOSE_FILE) up -d
docker-compose -f $(COMPOSE_FILE) ps docker-compose -f $(DOCKERCOMPOSE_FILE) ps
test-stop: test-stop:
docker-compose -f $(COMPOSE_FILE) stop || true docker-compose -f $(DOCKERCOMPOSE_FILE) stop || true