diff options
author | Kristofer Hallin <kristofer@sunet.se> | 2021-11-26 10:04:52 +0100 |
---|---|---|
committer | Kristofer Hallin <kristofer@sunet.se> | 2021-11-26 10:04:52 +0100 |
commit | fc4041593af0f58ead142441b6229b455dd3794b (patch) | |
tree | 949ffbac861b9100c9816970364612f65e17bf71 /quickstart.sh | |
parent | db53c0447da00003dddfc7feb640d6f59319de29 (diff) | |
parent | f90a61be00c1f9aebb1ba8c65b67a22d81e97f42 (diff) |
Merge branch 'main' of git.sunet.se:soc_collector into fastapi_pytest
Diffstat (limited to 'quickstart.sh')
-rwxr-xr-x | quickstart.sh | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/quickstart.sh b/quickstart.sh index 8da22e0..d46a791 100755 --- a/quickstart.sh +++ b/quickstart.sh @@ -21,6 +21,7 @@ fi # Generate new certificates to use for JWT. if [ ! -f ${DOCKER_JWT_PUBKEY_PATH}/private.pem ] && [ ! -f ${DOCKER_JWT_PUBKEY_PATH}/public.pem ]; then openssl ecparam -genkey -name prime256v1 -noout -out ${DOCKER_JWT_PUBKEY_PATH}/private.pem + chmod 644 ${DOCKER_JWT_PUBKEY_PATH}/private.pem openssl ec -in ${DOCKER_JWT_PUBKEY_PATH}/private.pem -pubout -out ${DOCKER_JWT_PUBKEY_PATH}/public.pem fi @@ -30,12 +31,5 @@ if [ ! -f ${DOCKER_JWT_HTPASSWD_PATH}/.htpasswd ]; then fi # Launch the containers. +docker-compose -f docker/docker-compose-dev.yaml up -d docker-compose -f auth-server-poc/docker-compose.yml up -d - -if [ "$1" = "dev" ]; then - echo "Using docker/docker-compose-dev.yaml" - docker-compose -f docker/docker-compose-dev.yaml build collector - docker-compose -f docker/docker-compose-dev.yaml up -d -else - docker-compose -f docker/docker-compose.yaml up -d -fi |