Dist UI build in docker

docker-entrypoint.sh

@@ -26,23 +26,23 @@ else
 fi
 
 #
-# Applying the configuration
+# Setup the UI
 #
-echo ">> Applying config settings"
-cat "$projectDir/api/config/mailgunConfig.sample.js" | envsubst > "$projectDir/api/config/mailgunConfig.js"
-cat "$projectDir/ui/config/apiconfig.sample.js"      | envsubst > "$projectDir/ui/config/apiconfig.js"
+echo ">> Setting up UI"
 
-#
-# Doing the required builds
-#
+# Clone the files
+rm -rf /application/api/public/*
+cp -r /application/ui-dist/ /application/api/public/
 
-# Build the UI
-cd /application/ui
-npm run build
+# Find and replace
+find /application/api/public/ -type f -exec sed -i "s/\$\{MAILGUN_EMAIL_DOMAIN\}/$MAILGUN_EMAIL_DOMAIN/g" {} +
+find /application/api/public/ -type f -exec sed -i "s/\$\{WEBSITE_DOMAIN\}/$WEBSITE_DOMAIN/g" {} +
 
-# Export it to the api server static host
-rm -rf /application/api/public/*
-cp -r /application/ui/dist/* /application/api/public/
+#
+# Setup the API
+#
+echo ">> Setting up API config"
+cat "application/api/config/mailgunConfig.sample.js" | envsubst > "application/api/config/mailgunConfig.js"
 
 # Start the API
 cd /application/api/

dockerfile

@@ -2,8 +2,11 @@
 #
 # Base alpine image with all the various dependencies
 #
+# Note that the node sass is broken with
+# https://github.com/nodejs/docker-node/issues/1028
 #
-FROM node:12-alpine AS baseimage
+#
+FROM node:10-alpine AS baseimage
 
 # Install dependencies
 RUN apk add --no-cache gettext
@@ -33,11 +36,12 @@ RUN rm -rf /application/ui/node_modules
 RUN rm -rf /application/ui/dist
 
 # Lets do the initial npm install
-RUN cd /application/ui  && ls && npm install --production
-RUN cd /application/api && ls && npm install --production
+RUN cd /application/ui  && ls && npm install
+RUN cd /application/api && ls && npm install
 
-# Lets do the initial builds
-RUN cd /application/ui && npm build
+# Lets do the UI build
+RUN cp /application/ui/config/apiconfig.sample.js /application/ui/config/apiconfig.js
+RUN cd /application/ui && npm run build
 
 #
 #
@@ -47,7 +51,8 @@ RUN cd /application/ui && npm build
 FROM node:12-alpine as application
 
 # Copy over the built files
-COPY --from=builder /application /application/
+COPY --from=builder /application/api     /application/
+COPY --from=builder /application/ui/dist /application/ui-dist
 
 # Debugging logging
 RUN ls /application

ui/config/apiconfig.sample.js

@@ -1,5 +1,4 @@
 export default {
-	apiUrl: 'https://${WEBSITE_DOMAIN}/api/v1/mail',
+	apiUrl: '//${WEBSITE_DOMAIN}/api/v1/mail',
 	domain: '${MAILGUN_EMAIL_DOMAIN}'
- }
-
+}