Skip to content

Commit

Permalink
refactor: Replace Settings with AppConfig (DEV-1312) (#2202)
Browse files Browse the repository at this point in the history
  • Loading branch information
irinaschubert committed Sep 20, 2022
1 parent bec5b8a commit 9b76417
Show file tree
Hide file tree
Showing 186 changed files with 1,736 additions and 2,354 deletions.
8 changes: 8 additions & 0 deletions .codecov.yml
@@ -0,0 +1,8 @@
coverage:
status:
project:
default:
informational: true
patch:
default:
informational: true
24 changes: 12 additions & 12 deletions Makefile
Expand Up @@ -86,7 +86,7 @@ env-file: ## write the env file used by knora-stack.
#################################

.PHONY: stack-up
stack-up: docker-build env-file ## starts the knora-stack: fuseki, sipi, redis, api.
stack-up: docker-build env-file ## starts the knora-stack: fuseki, sipi, api.
@docker compose -f docker-compose.yml up -d db
$(CURRENT_DIR)/webapi/scripts/wait-for-db.sh
@docker compose -f docker-compose.yml up -d
Expand All @@ -98,12 +98,16 @@ stack-up-fast: docker-build-knora-api-image env-file ## starts the knora-stack b

.PHONY: stack-up-ci
stack-up-ci: KNORA_DB_REPOSITORY_NAME := knora-test-unit
stack-up-ci: docker-build env-file print-env-file ## starts the knora-stack using 'knora-test-unit' repository: fuseki, sipi, redis, api.
stack-up-ci: docker-build env-file print-env-file ## starts the knora-stack using 'knora-test-unit' repository: fuseki, sipi, api.
docker-compose -f docker-compose.yml up -d

.PHONY: stack-restart
stack-restart: stack-up ## re-starts the knora-stack: fuseki, sipi, redis, api.
@docker compose -f docker-compose.yml restart
stack-restart: ## re-starts the knora-stack: fuseki, sipi, api.
@docker compose -f docker-compose.yml down
@docker compose -f docker-compose.yml up -d db
$(CURRENT_DIR)/webapi/scripts/wait-for-db.sh
@docker compose -f docker-compose.yml up -d
$(CURRENT_DIR)/webapi/scripts/wait-for-knora.sh

.PHONY: stack-restart-api
stack-restart-api: ## re-starts the api. Usually used after loading data into fuseki.
Expand All @@ -130,10 +134,6 @@ stack-logs-sipi: ## prints out and follows the logs of the 'sipi' container runn
stack-logs-sipi-no-follow: ## prints out the logs of the 'sipi' container running in knora-stack.
@docker compose -f docker-compose.yml logs sipi

.PHONY: stack-logs-redis
stack-logs-redis: ## prints out and follows the logs of the 'redis' container running in knora-stack.
@docker compose -f docker-compose.yml logs -f redis

.PHONY: stack-logs-api
stack-logs-api: ## prints out and follows the logs of the 'api' container running in knora-stack.
@docker compose -f docker-compose.yml logs -f api
Expand Down Expand Up @@ -164,11 +164,11 @@ stack-config: env-file

## stack without api
.PHONY: stack-without-api
stack-without-api: stack-up ## starts the knora-stack without knora-api: fuseki, sipi, redis.
stack-without-api: stack-up ## starts the knora-stack without knora-api: fuseki and sipi only.
@docker compose -f docker-compose.yml stop api

.PHONY: stack-without-api-and-sipi
stack-without-api-and-sipi: stack-up ## starts the knora-stack without knora-api and sipi: fuseki, redis.
stack-without-api-and-sipi: stack-up ## starts the knora-stack without knora-api and sipi: fuseki only.
@docker compose -f docker-compose.yml stop api
@docker compose -f docker-compose.yml stop sipi

Expand Down Expand Up @@ -348,11 +348,11 @@ clean-sipi-projects: ## deletes all files uploaded within a project
@rm -rf sipi/images/originals/[0-9A-F][0-9A-F][0-9A-F][0-9A-F]

.PHONY: check
check: # Run code formating check
check: ## Run code formating check
@sbt "check"

.PHONY: fmt
fmt: # Run code formating fix
fmt: ## Run code formating fix
@sbt "fmt"


Expand Down

0 comments on commit 9b76417

Please sign in to comment.