Use client v1.0.0, build it during docker build

LayerManager · Oct 31, 2019 · f6ade15 · f6ade15
1 parent d48fc3b
commit f6ade15
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git a/.env.demo b/.env.demo
@@ -45,7 +45,7 @@ LAYMAN_CLIENT_URL=http://layman_client:3000/client/
 
 # client
 LAYMAN_CLIENT_PUBLIC_URL=http://localhost/client/
-LAYMAN_CLIENT_VERSION=c4f35bcd57c7ed7d1f0f8a63fff29183e77d9922
+LAYMAN_CLIENT_VERSION=v1.0.0
 
 
 ##############################################################################

diff --git a/.env.dev b/.env.dev
@@ -46,7 +46,7 @@ LAYMAN_CLIENT_URL=http://layman_client:3000/client/
 
 # client
 LAYMAN_CLIENT_PUBLIC_URL=http://localhost:3000/client/
-LAYMAN_CLIENT_VERSION=c4f35bcd57c7ed7d1f0f8a63fff29183e77d9922
+LAYMAN_CLIENT_VERSION=v1.0.0
 
 
 ##############################################################################

diff --git a/.env.test b/.env.test
@@ -45,7 +45,7 @@ LAYMAN_TIMGEN_URL=http://hslayers:8080/
 LAYMAN_CLIENT_URL=http://layman_client_test:3000/client/
 
 # client
-LAYMAN_CLIENT_VERSION=c4f35bcd57c7ed7d1f0f8a63fff29183e77d9922
+LAYMAN_CLIENT_VERSION=v1.0.0
 
 
 ##############################################################################

diff --git a/client/docker/Dockerfile.production b/client/docker/Dockerfile.production
@@ -12,5 +12,6 @@ RUN test -n "LAYMAN_CLIENT_VERSION"
 RUN wget "https://github.com/jirik/layman-test-client/archive/$LAYMAN_CLIENT_VERSION.tar.gz" -O client.tar.gz && \
     tar -xvf client.tar.gz --strip 1 && \
     rm client.tar.gz && \
-    npm ci
+    npm ci && \
+    npm run build
 
diff --git a/docker-compose.demo.yml b/docker-compose.demo.yml
@@ -78,7 +78,7 @@ services:
         args:
            - LAYMAN_CLIENT_VERSION=${LAYMAN_CLIENT_VERSION}
       image: layman_client:latest
-      command: sh -c "npm run build && npm start"
+      command: sh -c "npm start"
       env_file:
          - .env
 #      ports:

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -85,7 +85,7 @@ services:
         args:
            - LAYMAN_CLIENT_VERSION=${LAYMAN_CLIENT_VERSION}
       image: layman_client:latest
-      command: sh -c "npm run build && npm start"
+      command: sh -c "npm start"
       env_file:
          - .env
       ports:

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
@@ -63,6 +63,6 @@ services:
         args:
            - LAYMAN_CLIENT_VERSION=${LAYMAN_CLIENT_VERSION}
       image: layman_client_test:latest
-      command: sh -c "npm run build && npm start"
+      command: sh -c "npm start"
       env_file:
          - .env.test