diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 37c901a82..feeb6c64c 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -74,11 +74,11 @@ services: environment: - CODESANDBOX_SSE=1 # so that ws: protocol ends up as auto: in node_modules/@vue/cli-service/lib/commands/serve.js - CYPRESS_CACHE_FOLDER=/tmp/.cache # https://github.com/cypress-io/cypress/issues/1281#issuecomment-404823001 - - VUE_APP_DESECSTACK_NS=${DESECSTACK_NS} - - VUE_APP_DESECSTACK_API_SEPA_CREDITOR_ID=${DESECSTACK_API_SEPA_CREDITOR_ID} - - VUE_APP_DESECSTACK_API_SEPA_CREDITOR_NAME=${DESECSTACK_API_SEPA_CREDITOR_NAME} - - VUE_APP_LOCAL_PUBLIC_SUFFIXES=dedyn.${DESECSTACK_DOMAIN} - - VUE_APP_EMAIL=support@desec.${DESECSTACK_DOMAIN} + - VITE_APP_DESECSTACK_NS=${DESECSTACK_NS} + - VITE_APP_DESECSTACK_API_SEPA_CREDITOR_ID=${DESECSTACK_API_SEPA_CREDITOR_ID} + - VITE_APP_DESECSTACK_API_SEPA_CREDITOR_NAME=${DESECSTACK_API_SEPA_CREDITOR_NAME} + - VITE_APP_LOCAL_PUBLIC_SUFFIXES=dedyn.${DESECSTACK_DOMAIN} + - VITE_APP_EMAIL=support@desec.${DESECSTACK_DOMAIN} networks: - rearwebapp logging: diff --git a/www/Dockerfile b/www/Dockerfile index 0472208ac..bd7dac91f 100644 --- a/www/Dockerfile +++ b/www/Dockerfile @@ -14,14 +14,14 @@ ARG DESECSTACK_API_SEPA_CREDITOR_ID ARG DESECSTACK_API_SEPA_CREDITOR_NAME ARG DESECSTACK_DOMAIN ARG DESECSTACK_NS -ENV VUE_APP_DESECSTACK_NS=${DESECSTACK_NS} \ - VUE_APP_DESECSTACK_API_SEPA_CREDITOR_ID=${DESECSTACK_API_SEPA_CREDITOR_ID} \ - VUE_APP_DESECSTACK_API_SEPA_CREDITOR_NAME=${DESECSTACK_API_SEPA_CREDITOR_NAME} \ - VUE_APP_LOCAL_PUBLIC_SUFFIXES=dedyn.${DESECSTACK_DOMAIN} \ - VUE_APP_EMAIL=support@desec.${DESECSTACK_DOMAIN} +ENV VITE_APP_DESECSTACK_NS=${DESECSTACK_NS} \ + VITE_APP_DESECSTACK_API_SEPA_CREDITOR_ID=${DESECSTACK_API_SEPA_CREDITOR_ID} \ + VITE_APP_DESECSTACK_API_SEPA_CREDITOR_NAME=${DESECSTACK_API_SEPA_CREDITOR_NAME} \ + VITE_APP_LOCAL_PUBLIC_SUFFIXES=dedyn.${DESECSTACK_DOMAIN} \ + VITE_APP_EMAIL=support@desec.${DESECSTACK_DOMAIN} COPY webapp/ /usr/src/app/ -RUN npm run build -- --no-clean +RUN npm run build -- --emptyOutDir false FROM nginx:mainline-alpine