Upstream sync

This commit is contained in:
Senad Uka
2018-05-22 12:40:22 +02:00
parent 39c614fb98
commit 6e903b4d57
31 changed files with 948 additions and 83 deletions

View File

@@ -12,7 +12,7 @@ RUN_CONTAINER_NAME = ${APP_NAME}-run
#############################
set-loc:
$(eval DEPLOY_ENV := loc)
$(eval DEPLOY_ENV := dev)
set-dev:
$(eval DEPLOY_ENV := dev)
@@ -49,6 +49,7 @@ build: clean create-build-container
# Creates the necessary folders.
mkdir -p dist/static
mkdir -p dist/docs
mkdir -p dist/certs
# Builds inside the container.
docker run \
@@ -66,6 +67,9 @@ build: clean create-build-container
# Copies the docs and the static files to the correct folder.
cp -R static/* ./dist/static/
cp -R docs/swagger/ ./dist/docs/
cp -R certs/${DEPLOY_ENV}/ ./dist/certs/
cp default.${DEPLOY_ENV}.conf ./dist/default.conf
cp nginx.conf ./dist/nginx.conf
cp config.${DEPLOY_ENV}.toml ./dist/config.toml
cp authorization_model.conf ./dist/authorization_model.conf
cp authorization_policy.csv ./dist/authorization_policy.csv