diff --git a/apps/.dockerignore b/apps/.dockerignore index a58c5dc8..574abffa 100644 --- a/apps/.dockerignore +++ b/apps/.dockerignore @@ -1,4 +1,5 @@ .git .cache .dot -**/doc \ No newline at end of file +**/doc +**/node_modules/ diff --git a/docker-compose.yml b/docker-compose.yml index 250aaec1..3fc50e5e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -82,11 +82,11 @@ services: - traefik.http.routers.${STACK_NAME?Variable not set}-proxy-http.middlewares=${STACK_NAME?Variable not set}-www-redirect,${STACK_NAME?Variable not set}-https-redirect cicada: - image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/cicada:latest + image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/cicada:${TAG:-latest} build: context: ./apps/cic-staff-client args: - FRONTEND_ENV: prod + FRONTEND_ENV: ${FRONTEND_ENV:-prod} deploy: labels: - traefik.enable=true diff --git a/scripts/build-push.sh b/scripts/build-push.sh old mode 100644 new mode 100755 diff --git a/scripts/build.sh b/scripts/build.sh old mode 100644 new mode 100755 index 21528c53..86d10d13 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -4,7 +4,7 @@ set -e TAG=${TAG?Variable not set} \ -FRONTEND_ENV=${FRONTEND_ENV-production} \ +FRONTEND_ENV=${FRONTEND_ENV-prod} \ docker-compose \ -f docker-compose.yml \ build diff --git a/scripts/deploy.sh b/scripts/deploy.sh old mode 100644 new mode 100755 diff --git a/scripts/test-local.sh b/scripts/test-local.sh old mode 100644 new mode 100755 diff --git a/scripts/test.sh b/scripts/test.sh old mode 100644 new mode 100755