upd server

.dockerignore

@@ -1,3 +1,2 @@
 node_modules
-gecko-upload-server
 npm-debug.log

Dockerfile

@@ -1,13 +1,12 @@
 FROM node:8.7.0-alpine
 
-RUN mkdir -p /srv/app/gecko-front
-WORKDIR /srv/app/gecko-front
+RUN mkdir -p /srv/app/gecko
+WORKDIR /srv/app/gecko
 
 COPY package*.json ./
 RUN npm install
 
 COPY . .
+RUN npm run build
 
-EXPOSE 4000
-
-CMD ["npm", "run", "dev"]
+CMD ["npm", "run", "server"]

app/dataManager.js

@@ -21,19 +21,9 @@ class dataManager {
     }
 
     saveDataToServer(data, filename) {
-        let url
-        if (process.env.UPLOAD_SERVER_ROOT) {
-            url = process.env.UPLOAD_SERVER_ROOT
-        } else {
-            url = window.location.protocol + '//' + window.location.hostname
-            if (process.env.GECKO_SERVER_HOST_PORT) {
-                url += ':' + process.env.GECKO_SERVER_HOST_PORT
-            }
-        }
-
         this.$http({
             method: 'POST',
-            url:  url + '/upload_s3',
+            url:  '/upload_s3',
             headers: {
                 'Access-Control-Allow-Origin': true
             },

docker-compose.yml

@@ -10,7 +10,7 @@ services:
 # Setup node container
 ################################
   server:
-    build: ./gecko-upload-server
+    build: ./
     expose:
       - ${GECKO_SERVER_HOST_PORT}
     environment:
@@ -22,25 +22,10 @@ services:
       AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
       AWS_COGNITO_POOL: ${AWS_COGNITO_POOL}
       AWS_FOLDER: ${AWS_FOLDER}
-    networks:
-      - gecko
-    ports:
-      - ${GECKO_SERVER_HOST_PORT}:${GECKO_SERVER_CONTAINER_PORT}
-    command: npm run start
-
-################################
-# Setup client container
-################################
-  client:
-    build: ./
-    expose:
-      - ${GECKO_APP_HOST_PORT}
-    environment:
       GECKO_APP_HOST: ${GECKO_APP_HOST}
-      GECKO_APP_HOST_PORT: ${GECKO_APP_HOST_PORT}
       GECKO_APP_CONTAINER_PORT: ${GECKO_APP_CONTAINER_PORT}
-    ports:
-      - ${GECKO_APP_HOST_PORT}:${GECKO_APP_CONTAINER_PORT}
     networks:
       - gecko
-    command: npm run dev
+    ports:
+      - ${GECKO_SERVER_HOST_PORT}:${GECKO_SERVER_CONTAINER_PORT}
+    command: npm run server