Skip to content

Commit

Permalink
Merge pull request #2686 from bcgov/release/is44
Browse files Browse the repository at this point in the history
  • Loading branch information
asanchezr authored Jan 19, 2023
2 parents f67be07 + 07482f7 commit 475955c
Show file tree
Hide file tree
Showing 768 changed files with 122,814 additions and 23,935 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# the repo. Unless a later match takes precedence,
# @global-owner1 and @global-owner2 will be requested for
# review when someone opens a pull request.
* @devinleighsmith @asanchezr @FuriousLlama @stairaku @Maheshbabu28 @PryancaJSharma
* @devinleighsmith @asanchezr @FuriousLlama @stairaku @Maheshbabu28 @PryancaJSharma @eddherrera

# Order is important; the last matching pattern takes the most
# precedence. When someone opens a pull request that only
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,10 @@ restart: | stop build up ## Restart local docker environment

refresh: | down build up ## Recreates local docker environment

.PHONY: start-infra
start-infra: ## Starts infrastructure containers (e.g. keycloak, database, geoserver). Useful for local debugging
.PHONY: infra
infra: ## Starts infrastructure containers (e.g. database, geoserver). Useful for local debugging
@echo "$(P) Starting up infrastructure containers..."
@"$(MAKE)" start n="keycloak database geoserver"
@"$(MAKE)" start n="database geoserver"

start: ## Starts the local containers (n=service name)
@echo "$(P) Starting client and server containers..."
Expand Down Expand Up @@ -236,7 +236,7 @@ server-test: ## Runs the server tests in a container

server-run: ## Starts local server containers
@echo "$(P) Starting server containers..."
@docker-compose up -d keycloak backend
@docker-compose up -d backend

npm-clean: ## Removes local containers, images, volumes, for frontend application.
@echo "$(P) Removing frontend containers and volumes."
Expand Down
47 changes: 0 additions & 47 deletions auth/.gitignore

This file was deleted.

83 changes: 0 additions & 83 deletions auth/README.md

This file was deleted.

8 changes: 0 additions & 8 deletions auth/keycloak/Dockerfile

This file was deleted.

99 changes: 0 additions & 99 deletions auth/keycloak/README.md

This file was deleted.

Loading

0 comments on commit 475955c

Please sign in to comment.