fix: deployments to DO (e0091229) · Commits · Isfand Yar Khan / ever-demand

.deploy/carrier-mobile-ionic/Dockerfile

+47 −44

Original line number	Diff line number	Diff line
		@@ -4,6 +4,13 @@ ARG API_BASE_URL
		ARG API_HOST
		ARG API_PORT
		ARG CLIENT_BASE_URL
		ARG DEMO
		ARG WEB_HOST
		ARG WEB_PORT
		ARG HTTPS_SERVICES_ENDPOINT
		ARG SERVICES_ENDPOINT
		ARG GQL_ENDPOINT
		ARG GQL_SUBSCRIPTIONS_ENDPOINT
		ARG SENTRY_DSN
		ARG CHATWOOT_SDK_TOKEN
		ARG CLOUDINARY_CLOUD_NAME
		@@ -15,9 +22,6 @@ ARG DEFAULT_LATITUDE
		ARG DEFAULT_LONGITUDE
		ARG DEFAULT_CURRENCY
		ARG DEFAULT_LANGUAGE
		ARG DEMO
		ARG WEB_HOST
		ARG WEB_PORT
		ARG DEFAULT_CUSTOMER_LOGO
		ARG LOGIN_LOGO
		ARG NO_INTERNET_LOGO
		@@ -26,10 +30,6 @@ ARG APP_NAME
		ARG MIXPANEL_API_KEY
		ARG DEFAULT_LOGIN_USERNAME
		ARG DEFAULT_LOGIN_PASSWORD
		ARG GQL_ENDPOINT
		ARG GQL_SUBSCRIPTIONS_ENDPOINT
		ARG SERVICES_ENDPOINT
		ARG HTTPS_SERVICES_ENDPOINT
		ARG SETTINGS_APP_TYPE
		ARG SETTINGS_MAINTENANCE_API_URL

		@@ -87,37 +87,6 @@ COPY --chown=node:node --from=development /srv/ever .
		ENV NODE_OPTIONS=${NODE_OPTIONS:-"--max-old-space-size=2048"}
		ENV NODE_ENV=${NODE_ENV:-production}

		ENV API_BASE_URL=${API_BASE_URL:-http://localhost:3000}
		ENV CLIENT_BASE_URL=${CLIENT_BASE_URL:-http://localhost:4203}
		ENV SENTRY_DSN=${SENTRY_DSN}

		ENV CHATWOOT_SDK_TOKEN=${CHATWOOT_SDK_TOKEN}
		ENV CLOUDINARY_CLOUD_NAME=${CLOUDINARY_CLOUD_NAME}
		ENV CLOUDINARY_API_KEY=${CLOUDINARY_API_KEY}
		ENV GOOGLE_MAPS_API_KEY=${GOOGLE_MAPS_API_KEY}
		ENV GOOGLE_ANALYTICS_API_KEY=${GOOGLE_ANALYTICS_API_KEY}
		ENV GOOGLE_PLACE_AUTOCOMPLETE=${GOOGLE_PLACE_AUTOCOMPLETE:-false}
		ENV DEFAULT_LATITUDE=${DEFAULT_LATITUDE:-42.6459136}
		ENV DEFAULT_LONGITUDE=${DEFAULT_LONGITUDE:-23.3332736}
		ENV DEFAULT_CURRENCY=${DEFAULT_CURRENCY:-USD}_DSN}
		ENV DEFAULT_LANGUAGE=${DEFAULT_LANGUAGE:-en}
		ENV DEFAULT_CUSTOMER_LOGO=${DEFAULT_CUSTOMER_LOGO}
		ENV LOGIN_LOGO=${LOGIN_LOGO}
		ENV NO_INTERNET_LOGO=${NO_INTERNET_LOGO}
		ENV COMPANY_NAME=${COMPANY_NAME}
		ENV APP_NAME=${APP_NAME}
		ENV MIXPANEL_API_KEY=${MIXPANEL_API_KEY}
		ENV DEFAULT_LOGIN_USERNAME=${DEFAULT_LOGIN_USERNAME}
		ENV DEFAULT_LOGIN_PASSWORD=${DEFAULT_LOGIN_PASSWORD}
		ENV GQL_ENDPOINT=${GQL_ENDPOINT}
		ENV GQL_SUBSCRIPTIONS_ENDPOINT=${GQL_SUBSCRIPTIONS_ENDPOINT}
		ENV SERVICES_ENDPOINT=${SERVICES_ENDPOINT}
		ENV HTTPS_SERVICES_ENDPOINT=${HTTPS_SERVICES_ENDPOINT}
		ENV SETTINGS_APP_TYPE=${SETTINGS_APP_TYPE}
		ENV SETTINGS_MAINTENANCE_API_URL=${SETTINGS_MAINTENANCE_API_URL}

		ENV DEMO=${DEMO:-false}

		ENV IS_DOCKER=true

		RUN yarn build:carrier
		@@ -136,17 +105,51 @@ COPY --chown=nginx:nginx --from=build /srv/ever/packages/carrier-mobile-ionic/ww
		RUN chmod +x wait entrypoint.compose.sh entrypoint.prod.sh && \
		chmod a+rw /etc/nginx/conf.d/compose.conf.template /etc/nginx/conf.d/prod.conf.template

		ENV API_BASE_URL=${API_BASE_URL:-http://localhost:3000}
		ENV CLIENT_BASE_URL=${CLIENT_BASE_URL:-http://localhost:4203}
		ENV SENTRY_DSN=${SENTRY_DSN}

		ENV API_HOST=${API_HOST:-api}
		ENV API_PORT=${API_PORT:-3000}
		ENV WEB_HOST=${WEB_HOST:-0.0.0.0}
		ENV WEB_PORT=${WEB_PORT:-4203}

		ENV API_BASE_URL=${API_BASE_URL:-http://localhost:3000}
		ENV CLIENT_BASE_URL=${CLIENT_BASE_URL:-http://localhost:4203}
		ENV WEB_HOST=${WEB_HOST:-0.0.0.0}
		ENV WEB_PORT=${WEB_PORT:-4200}
		ENV DEMO=${DEMO:-false}

		ENV HTTPS_SERVICES_ENDPOINT=${HTTPS_SERVICES_ENDPOINT}
		ENV SERVICES_ENDPOINT=${SERVICES_ENDPOINT}
		ENV GQL_ENDPOINT=${GQL_ENDPOINT}
		ENV GQL_SUBSCRIPTIONS_ENDPOINT=${GQL_SUBSCRIPTIONS_ENDPOINT}
		ENV SENTRY_DSN=${SENTRY_DSN}
		ENV CHATWOOT_SDK_TOKEN=${CHATWOOT_SDK_TOKEN}
		ENV CLOUDINARY_CLOUD_NAME=${CLOUDINARY_CLOUD_NAME}
		ENV CLOUDINARY_API_KEY=${CLOUDINARY_API_KEY}
		ENV GOOGLE_MAPS_API_KEY=${GOOGLE_MAPS_API_KEY}
		ENV GOOGLE_PLACE_AUTOCOMPLETE=${GOOGLE_PLACE_AUTOCOMPLETE:-false}
		ENV DEFAULT_LATITUDE=${DEFAULT_LATITUDE:-42.6459136}
		ENV DEFAULT_LONGITUDE=${DEFAULT_LONGITUDE:-23.3332736}
		ENV DEFAULT_CURRENCY=${DEFAULT_CURRENCY:-USD}_DSN}
		ENV DEFAULT_LANGUAGE=${DEFAULT_LANGUAGE}
		ENV DEFAULT_LOGIN_USERNAME=${DEFAULT_LOGIN_USERNAME}
		ENV DEFAULT_LOGIN_PASSWORD=${DEFAULT_LOGIN_PASSWORD}
		ENV DEFAULT_CUSTOMER_LOGO=${DEFAULT_CUSTOMER_LOGO}
		ENV LOGIN_LOGO=${LOGIN_LOGO}
		ENV MIXPANEL_API_KEY=${MIXPANEL_API_KEY}
		ENV CURRENCY_SYMBOL=${CURRENCY_SYMBOL}
		ENV NO_INTERNET_LOGO=${NO_INTERNET_LOGO}
		ENV MAP_MERCHANT_ICON_LINK=${MAP_MERCHANT_ICON_LINK}
		ENV MAP_USER_ICON_LINK=${MAP_USER_ICON_LINK}
		ENV MAP_CARRIER_ICON_LINK=${MAP_CARRIER_ICON_LINK}
		ENV API_FILE_UPLOAD_URL=${API_FILE_UPLOAD_URL}
		ENV APP_NAME=${APP_NAME}
		ENV COMPANY_NAME=${COMPANY_NAME}
		ENV COMPANY_SITE_LINK=${COMPANY_SITE_LINK}
		ENV COMPANY_GITHUB_LINK=${COMPANY_GITHUB_LINK}
		ENV COMPANY_FACEBOOK_LINK=${COMPANY_FACEBOOK_LINK}
		ENV COMPANY_TWITTER_LINK=${COMPANY_TWITTER_LINK}
		ENV COMPANY_LINKEDIN_LINK=${COMPANY_LINKEDIN_LINK}
		ENV GENERATE_PASSWORD_CHARSET=${GENERATE_PASSWORD_CHARSET}
		ENV SETTINGS_APP_TYPE=${SETTINGS_APP_TYPE}
		ENV SETTINGS_MAINTENANCE_API_URL=${SETTINGS_MAINTENANCE_API_URL}

		EXPOSE ${WEB_PORT}

		ENTRYPOINT [ "./entrypoint.prod.sh" ]

.deploy/merchant-tablet-ionic/Dockerfile

+36 −43

Original line number	Diff line number	Diff line
		@@ -4,6 +4,13 @@ ARG API_BASE_URL
		ARG API_HOST
		ARG API_PORT
		ARG CLIENT_BASE_URL
		ARG DEMO
		ARG WEB_HOST
		ARG WEB_PORT
		ARG HTTPS_SERVICES_ENDPOINT
		ARG SERVICES_ENDPOINT
		ARG GQL_ENDPOINT
		ARG GQL_SUBSCRIPTIONS_ENDPOINT
		ARG SENTRY_DSN
		ARG CHATWOOT_SDK_TOKEN
		ARG CLOUDINARY_CLOUD_NAME
		@@ -15,9 +22,6 @@ ARG DEFAULT_LATITUDE
		ARG DEFAULT_LONGITUDE
		ARG DEFAULT_CURRENCY
		ARG DEFAULT_LANGUAGE
		ARG DEMO
		ARG WEB_HOST
		ARG WEB_PORT
		ARG DEFAULT_CUSTOMER_LOGO
		ARG LOGIN_LOGO
		ARG NO_INTERNET_LOGO
		@@ -26,10 +30,6 @@ ARG APP_NAME
		ARG MIXPANEL_API_KEY
		ARG DEFAULT_LOGIN_USERNAME
		ARG DEFAULT_LOGIN_PASSWORD
		ARG GQL_ENDPOINT
		ARG GQL_SUBSCRIPTIONS_ENDPOINT
		ARG SERVICES_ENDPOINT
		ARG HTTPS_SERVICES_ENDPOINT
		ARG SETTINGS_APP_TYPE
		ARG SETTINGS_MAINTENANCE_API_URL

		@@ -87,37 +87,6 @@ COPY --chown=node:node --from=development /srv/ever .
		ENV NODE_OPTIONS=${NODE_OPTIONS:-"--max-old-space-size=2048"}
		ENV NODE_ENV=${NODE_ENV:-production}

		ENV API_BASE_URL=${API_BASE_URL:-http://localhost:3000}
		ENV CLIENT_BASE_URL=${CLIENT_BASE_URL:-http://localhost:4202}
		ENV SENTRY_DSN=${SENTRY_DSN}

		ENV CHATWOOT_SDK_TOKEN=${CHATWOOT_SDK_TOKEN}
		ENV CLOUDINARY_CLOUD_NAME=${CLOUDINARY_CLOUD_NAME}
		ENV CLOUDINARY_API_KEY=${CLOUDINARY_API_KEY}
		ENV GOOGLE_MAPS_API_KEY=${GOOGLE_MAPS_API_KEY}
		ENV GOOGLE_ANALYTICS_API_KEY=${GOOGLE_ANALYTICS_API_KEY}
		ENV GOOGLE_PLACE_AUTOCOMPLETE=${GOOGLE_PLACE_AUTOCOMPLETE:-false}
		ENV DEFAULT_LATITUDE=${DEFAULT_LATITUDE:-42.6459136}
		ENV DEFAULT_LONGITUDE=${DEFAULT_LONGITUDE:-23.3332736}
		ENV DEFAULT_CURRENCY=${DEFAULT_CURRENCY:-USD}_DSN}
		ENV DEFAULT_LANGUAGE=${DEFAULT_LANGUAGE:-en}
		ENV DEFAULT_CUSTOMER_LOGO=${DEFAULT_CUSTOMER_LOGO}
		ENV LOGIN_LOGO=${LOGIN_LOGO}
		ENV NO_INTERNET_LOGO=${NO_INTERNET_LOGO}
		ENV COMPANY_NAME=${COMPANY_NAME}
		ENV APP_NAME=${APP_NAME}
		ENV MIXPANEL_API_KEY=${MIXPANEL_API_KEY}
		ENV DEFAULT_LOGIN_USERNAME=${DEFAULT_LOGIN_USERNAME}
		ENV DEFAULT_LOGIN_PASSWORD=${DEFAULT_LOGIN_PASSWORD}
		ENV GQL_ENDPOINT=${GQL_ENDPOINT}
		ENV GQL_SUBSCRIPTIONS_ENDPOINT=${GQL_SUBSCRIPTIONS_ENDPOINT}
		ENV SERVICES_ENDPOINT=${SERVICES_ENDPOINT}
		ENV HTTPS_SERVICES_ENDPOINT=${HTTPS_SERVICES_ENDPOINT}
		ENV SETTINGS_APP_TYPE=${SETTINGS_APP_TYPE}
		ENV SETTINGS_MAINTENANCE_API_URL=${SETTINGS_MAINTENANCE_API_URL}

		ENV DEMO=${DEMO:-false}

		ENV IS_DOCKER=true

		RUN yarn build:merchant
		@@ -136,17 +105,41 @@ COPY --chown=nginx:nginx --from=build /srv/ever/packages/merchant-tablet-ionic/w
		RUN chmod +x wait entrypoint.compose.sh entrypoint.prod.sh && \
		chmod a+rw /etc/nginx/conf.d/compose.conf.template /etc/nginx/conf.d/prod.conf.template

		ENV API_BASE_URL=${API_BASE_URL:-http://localhost:3000}
		ENV CLIENT_BASE_URL=${CLIENT_BASE_URL:-http://localhost:4202}
		ENV SENTRY_DSN=${SENTRY_DSN}

		ENV API_HOST=${API_HOST:-api}
		ENV API_PORT=${API_PORT:-3000}

		ENV API_BASE_URL=${API_BASE_URL:-http://localhost:3000}
		ENV CLIENT_BASE_URL=${CLIENT_BASE_URL:-http://localhost:4202}
		ENV WEB_HOST=${WEB_HOST:-0.0.0.0}
		ENV WEB_PORT=${WEB_PORT:-4202}

		ENV DEMO=${DEMO:-false}

		ENV HTTPS_SERVICES_ENDPOINT=${HTTPS_SERVICES_ENDPOINT}
		ENV SERVICES_ENDPOINT=${SERVICES_ENDPOINT}
		ENV GQL_ENDPOINT=${GQL_ENDPOINT}
		ENV GQL_SUBSCRIPTIONS_ENDPOINT=${GQL_SUBSCRIPTIONS_ENDPOINT}
		ENV SENTRY_DSN=${SENTRY_DSN}
		ENV CHATWOOT_SDK_TOKEN=${CHATWOOT_SDK_TOKEN}
		ENV CLOUDINARY_CLOUD_NAME=${CLOUDINARY_CLOUD_NAME}
		ENV CLOUDINARY_API_KEY=${CLOUDINARY_API_KEY}
		ENV GOOGLE_MAPS_API_KEY=${GOOGLE_MAPS_API_KEY}
		ENV GOOGLE_ANALYTICS_API_KEY=${GOOGLE_ANALYTICS_API_KEY}
		ENV GOOGLE_PLACE_AUTOCOMPLETE=${GOOGLE_PLACE_AUTOCOMPLETE:-false}
		ENV DEFAULT_LATITUDE=${DEFAULT_LATITUDE:-42.6459136}
		ENV DEFAULT_LONGITUDE=${DEFAULT_LONGITUDE:-23.3332736}
		ENV DEFAULT_CURRENCY=${DEFAULT_CURRENCY:-USD}_DSN}
		ENV DEFAULT_LANGUAGE=${DEFAULT_LANGUAGE:-en}
		ENV DEFAULT_CUSTOMER_LOGO=${DEFAULT_CUSTOMER_LOGO}
		ENV LOGIN_LOGO=${LOGIN_LOGO}
		ENV NO_INTERNET_LOGO=${NO_INTERNET_LOGO}
		ENV COMPANY_NAME=${COMPANY_NAME}
		ENV APP_NAME=${APP_NAME}
		ENV MIXPANEL_API_KEY=${MIXPANEL_API_KEY}
		ENV DEFAULT_LOGIN_USERNAME=${DEFAULT_LOGIN_USERNAME}
		ENV DEFAULT_LOGIN_PASSWORD=${DEFAULT_LOGIN_PASSWORD}
		ENV SETTINGS_APP_TYPE=${SETTINGS_APP_TYPE}
		ENV SETTINGS_MAINTENANCE_API_URL=${SETTINGS_MAINTENANCE_API_URL}

		EXPOSE ${WEB_PORT}

		ENTRYPOINT [ "./entrypoint.prod.sh" ]

.deploy/shop-mobile-ionic/Dockerfile

+36 −43

Original line number	Diff line number	Diff line
		@@ -4,6 +4,13 @@ ARG API_BASE_URL
		ARG API_HOST
		ARG API_PORT
		ARG CLIENT_BASE_URL
		ARG DEMO
		ARG WEB_HOST
		ARG WEB_PORT
		ARG HTTPS_SERVICES_ENDPOINT
		ARG SERVICES_ENDPOINT
		ARG GQL_ENDPOINT
		ARG GQL_SUBSCRIPTIONS_ENDPOINT
		ARG SENTRY_DSN
		ARG CHATWOOT_SDK_TOKEN
		ARG CLOUDINARY_CLOUD_NAME
		@@ -15,9 +22,6 @@ ARG DEFAULT_LATITUDE
		ARG DEFAULT_LONGITUDE
		ARG DEFAULT_CURRENCY
		ARG DEFAULT_LANGUAGE
		ARG DEMO
		ARG WEB_HOST
		ARG WEB_PORT
		ARG DEFAULT_CUSTOMER_LOGO
		ARG LOGIN_LOGO
		ARG NO_INTERNET_LOGO
		@@ -26,10 +30,6 @@ ARG APP_NAME
		ARG MIXPANEL_API_KEY
		ARG DEFAULT_LOGIN_USERNAME
		ARG DEFAULT_LOGIN_PASSWORD
		ARG GQL_ENDPOINT
		ARG GQL_SUBSCRIPTIONS_ENDPOINT
		ARG SERVICES_ENDPOINT
		ARG HTTPS_SERVICES_ENDPOINT
		ARG SETTINGS_APP_TYPE
		ARG SETTINGS_MAINTENANCE_API_URL

		@@ -87,37 +87,6 @@ COPY --chown=node:node --from=development /srv/ever .
		ENV NODE_OPTIONS=${NODE_OPTIONS:-"--max-old-space-size=2048"}
		ENV NODE_ENV=${NODE_ENV:-production}

		ENV API_BASE_URL=${API_BASE_URL:-http://localhost:3000}
		ENV CLIENT_BASE_URL=${CLIENT_BASE_URL:-http://localhost:4201}
		ENV SENTRY_DSN=${SENTRY_DSN}

		ENV CHATWOOT_SDK_TOKEN=${CHATWOOT_SDK_TOKEN}
		ENV CLOUDINARY_CLOUD_NAME=${CLOUDINARY_CLOUD_NAME}
		ENV CLOUDINARY_API_KEY=${CLOUDINARY_API_KEY}
		ENV GOOGLE_MAPS_API_KEY=${GOOGLE_MAPS_API_KEY}
		ENV GOOGLE_ANALYTICS_API_KEY=${GOOGLE_ANALYTICS_API_KEY}
		ENV GOOGLE_PLACE_AUTOCOMPLETE=${GOOGLE_PLACE_AUTOCOMPLETE:-false}
		ENV DEFAULT_LATITUDE=${DEFAULT_LATITUDE:-42.6459136}
		ENV DEFAULT_LONGITUDE=${DEFAULT_LONGITUDE:-23.3332736}
		ENV DEFAULT_CURRENCY=${DEFAULT_CURRENCY:-USD}_DSN}
		ENV DEFAULT_LANGUAGE=${DEFAULT_LANGUAGE:-en}
		ENV DEFAULT_CUSTOMER_LOGO=${DEFAULT_CUSTOMER_LOGO}
		ENV LOGIN_LOGO=${LOGIN_LOGO}
		ENV NO_INTERNET_LOGO=${NO_INTERNET_LOGO}
		ENV COMPANY_NAME=${COMPANY_NAME}
		ENV APP_NAME=${APP_NAME}
		ENV MIXPANEL_API_KEY=${MIXPANEL_API_KEY}
		ENV DEFAULT_LOGIN_USERNAME=${DEFAULT_LOGIN_USERNAME}
		ENV DEFAULT_LOGIN_PASSWORD=${DEFAULT_LOGIN_PASSWORD}
		ENV GQL_ENDPOINT=${GQL_ENDPOINT}
		ENV GQL_SUBSCRIPTIONS_ENDPOINT=${GQL_SUBSCRIPTIONS_ENDPOINT}
		ENV SERVICES_ENDPOINT=${SERVICES_ENDPOINT}
		ENV HTTPS_SERVICES_ENDPOINT=${HTTPS_SERVICES_ENDPOINT}
		ENV SETTINGS_APP_TYPE=${SETTINGS_APP_TYPE}
		ENV SETTINGS_MAINTENANCE_API_URL=${SETTINGS_MAINTENANCE_API_URL}

		ENV DEMO=${DEMO:-false}

		ENV IS_DOCKER=true

		RUN yarn build:shopmobile
		@@ -136,17 +105,41 @@ COPY --chown=nginx:nginx --from=build /srv/ever/packages/shop-mobile-ionic/www .
		RUN chmod +x wait entrypoint.compose.sh entrypoint.prod.sh && \
		chmod a+rw /etc/nginx/conf.d/compose.conf.template /etc/nginx/conf.d/prod.conf.template

		ENV API_BASE_URL=${API_BASE_URL:-http://localhost:3000}
		ENV CLIENT_BASE_URL=${CLIENT_BASE_URL:-http://localhost:4201}
		ENV SENTRY_DSN=${SENTRY_DSN}

		ENV API_HOST=${API_HOST:-api}
		ENV API_PORT=${API_PORT:-3000}

		ENV API_BASE_URL=${API_BASE_URL:-http://localhost:3000}
		ENV CLIENT_BASE_URL=${CLIENT_BASE_URL:-http://localhost:4201}
		ENV WEB_HOST=${WEB_HOST:-0.0.0.0}
		ENV WEB_PORT=${WEB_PORT:-4201}

		ENV DEMO=${DEMO:-false}

		ENV HTTPS_SERVICES_ENDPOINT=${HTTPS_SERVICES_ENDPOINT}
		ENV SERVICES_ENDPOINT=${SERVICES_ENDPOINT}
		ENV GQL_ENDPOINT=${GQL_ENDPOINT}
		ENV GQL_SUBSCRIPTIONS_ENDPOINT=${GQL_SUBSCRIPTIONS_ENDPOINT}
		ENV SENTRY_DSN=${SENTRY_DSN}
		ENV CHATWOOT_SDK_TOKEN=${CHATWOOT_SDK_TOKEN}
		ENV CLOUDINARY_CLOUD_NAME=${CLOUDINARY_CLOUD_NAME}
		ENV CLOUDINARY_API_KEY=${CLOUDINARY_API_KEY}
		ENV GOOGLE_MAPS_API_KEY=${GOOGLE_MAPS_API_KEY}
		ENV GOOGLE_ANALYTICS_API_KEY=${GOOGLE_ANALYTICS_API_KEY}
		ENV GOOGLE_PLACE_AUTOCOMPLETE=${GOOGLE_PLACE_AUTOCOMPLETE:-false}
		ENV DEFAULT_LATITUDE=${DEFAULT_LATITUDE:-42.6459136}
		ENV DEFAULT_LONGITUDE=${DEFAULT_LONGITUDE:-23.3332736}
		ENV DEFAULT_CURRENCY=${DEFAULT_CURRENCY:-USD}_DSN}
		ENV DEFAULT_LANGUAGE=${DEFAULT_LANGUAGE:-en}
		ENV DEFAULT_CUSTOMER_LOGO=${DEFAULT_CUSTOMER_LOGO}
		ENV LOGIN_LOGO=${LOGIN_LOGO}
		ENV NO_INTERNET_LOGO=${NO_INTERNET_LOGO}
		ENV COMPANY_NAME=${COMPANY_NAME}
		ENV APP_NAME=${APP_NAME}
		ENV MIXPANEL_API_KEY=${MIXPANEL_API_KEY}
		ENV DEFAULT_LOGIN_USERNAME=${DEFAULT_LOGIN_USERNAME}
		ENV DEFAULT_LOGIN_PASSWORD=${DEFAULT_LOGIN_PASSWORD}
		ENV SETTINGS_APP_TYPE=${SETTINGS_APP_TYPE}
		ENV SETTINGS_MAINTENANCE_API_URL=${SETTINGS_MAINTENANCE_API_URL}

		EXPOSE ${WEB_PORT}

		ENTRYPOINT [ "./entrypoint.prod.sh" ]

.deploy/shop-web-angular/Dockerfile

+36 −23

Original line number	Diff line number	Diff line
		@@ -4,6 +4,13 @@ ARG API_BASE_URL
		ARG API_HOST
		ARG API_PORT
		ARG CLIENT_BASE_URL
		ARG DEMO
		ARG WEB_HOST
		ARG WEB_PORT
		ARG HTTPS_SERVICES_ENDPOINT
		ARG SERVICES_ENDPOINT
		ARG GQL_ENDPOINT
		ARG GQL_SUBSCRIPTIONS_ENDPOINT
		ARG SENTRY_DSN
		ARG CHATWOOT_SDK_TOKEN
		ARG CLOUDINARY_CLOUD_NAME
		@@ -13,9 +20,12 @@ ARG GOOGLE_PLACE_AUTOCOMPLETE
		ARG DEFAULT_LATITUDE
		ARG DEFAULT_LONGITUDE
		ARG DEFAULT_CURRENCY
		ARG DEMO
		ARG WEB_HOST
		ARG WEB_PORT
		ARG AUTH_LOGO
		ARG NO_INTERNET_LOGO
		ARG DELIVERY_TIME_MIN
		ARG DELIVERY_TIME_MAX
		ARG SETTINGS_APP_TYPE
		ARG SETTINGS_MAINTENANCE_API_URL

		FROM node:16-alpine3.14 AS dependencies

		@@ -71,21 +81,6 @@ COPY --chown=node:node --from=development /srv/ever .
		ENV NODE_OPTIONS=${NODE_OPTIONS:-"--max-old-space-size=2048"}
		ENV NODE_ENV=${NODE_ENV:-production}

		ENV API_BASE_URL=${API_BASE_URL:-http://localhost:3000}
		ENV CLIENT_BASE_URL=${CLIENT_BASE_URL:-http://localhost:4200}
		ENV SENTRY_DSN=${SENTRY_DSN}

		ENV CHATWOOT_SDK_TOKEN=${CHATWOOT_SDK_TOKEN}
		ENV CLOUDINARY_CLOUD_NAME=${CLOUDINARY_CLOUD_NAME}
		ENV CLOUDINARY_API_KEY=${CLOUDINARY_API_KEY}
		ENV GOOGLE_MAPS_API_KEY=${GOOGLE_MAPS_API_KEY}
		ENV GOOGLE_PLACE_AUTOCOMPLETE=${GOOGLE_PLACE_AUTOCOMPLETE:-false}
		ENV DEFAULT_LATITUDE=${DEFAULT_LATITUDE:-42.6459136}
		ENV DEFAULT_LONGITUDE=${DEFAULT_LONGITUDE:-23.3332736}
		ENV DEFAULT_CURRENCY=${DEFAULT_CURRENCY:-USD}_DSN}

		ENV DEMO=${DEMO:-false}

		ENV IS_DOCKER=true

		RUN yarn build:shopweb
		@@ -104,17 +99,35 @@ COPY --chown=nginx:nginx --from=build /srv/ever/packages/shop-web-angular/build
		RUN chmod +x wait entrypoint.compose.sh entrypoint.prod.sh && \
		chmod a+rw /etc/nginx/conf.d/compose.conf.template /etc/nginx/conf.d/prod.conf.template

		ENV API_BASE_URL=${API_BASE_URL:-http://localhost:3000}
		ENV CLIENT_BASE_URL=${CLIENT_BASE_URL:-http://localhost:4200}
		ENV SENTRY_DSN=${SENTRY_DSN}

		ENV API_HOST=${API_HOST:-api}
		ENV API_PORT=${API_PORT:-3000}

		ENV API_BASE_URL=${API_BASE_URL:-http://localhost:3000}
		ENV CLIENT_BASE_URL=${CLIENT_BASE_URL:-http://localhost:4200}
		ENV WEB_HOST=${WEB_HOST:-0.0.0.0}
		ENV WEB_PORT=${WEB_PORT:-4200}

		ENV DEMO=${DEMO:-false}

		ENV HTTPS_SERVICES_ENDPOINT=${HTTPS_SERVICES_ENDPOINT}
		ENV SERVICES_ENDPOINT=${SERVICES_ENDPOINT}
		ENV GQL_ENDPOINT=${GQL_ENDPOINT}
		ENV GQL_SUBSCRIPTIONS_ENDPOINT=${GQL_SUBSCRIPTIONS_ENDPOINT}
		ENV SENTRY_DSN=${SENTRY_DSN}
		ENV CHATWOOT_SDK_TOKEN=${CHATWOOT_SDK_TOKEN}
		ENV CLOUDINARY_CLOUD_NAME=${CLOUDINARY_CLOUD_NAME}
		ENV CLOUDINARY_API_KEY=${CLOUDINARY_API_KEY}
		ENV GOOGLE_MAPS_API_KEY=${GOOGLE_MAPS_API_KEY}
		ENV GOOGLE_PLACE_AUTOCOMPLETE=${GOOGLE_PLACE_AUTOCOMPLETE:-false}
		ENV DEFAULT_LATITUDE=${DEFAULT_LATITUDE:-42.6459136}
		ENV DEFAULT_LONGITUDE=${DEFAULT_LONGITUDE:-23.3332736}
		ENV DEFAULT_CURRENCY=${DEFAULT_CURRENCY:-USD}_DSN}
		ENV AUTH_LOGO=${AUTH_LOGO}
		ENV NO_INTERNET_LOGO=${NO_INTERNET_LOGO}
		ENV DELIVERY_TIME_MIN=${DELIVERY_TIME_MIN}
		ENV DELIVERY_TIME_MAX=${DELIVERY_TIME_MAX}
		ENV SETTINGS_APP_TYPE=${SETTINGS_APP_TYPE}
		ENV SETTINGS_MAINTENANCE_API_URL=${SETTINGS_MAINTENANCE_API_URL}

		EXPOSE ${WEB_PORT}

		ENTRYPOINT [ "./entrypoint.prod.sh" ]