fix(rn): dockerized webapp fixed

berty · Oct 17, 2018 · dda7ec2 · dda7ec2
1 parent 9c43688
commit dda7ec2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/client/react-native/Dockerfile b/client/react-native/Dockerfile
@@ -3,27 +3,22 @@ FROM node:10.10.0-alpine
 
 # Create needed directories
 RUN mkdir -p /usr/src/app
-RUN mkdir /usr/src/app/web
 RUN mkdir /usr/src/app/common
 
-# Add `/usr/src/app/node_modules/.bin` to $PATH
-ENV PATH /usr/src/app/node_modules/.bin:$PATH
-ENV PATH /usr/src/app/web/node_modules/.bin:$PATH
-
 # Install watchman
 RUN mkdir /var/run/watchman
 RUN echo "@testing http://dl-4.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \
     apk update && apk add --no-cache watchman@testing
 
 # Install common dependencies
 COPY common/schema.graphql /usr/src/app/common/schema.graphql
+COPY .eslintrc /usr/src/app/.eslintrc
 COPY package.json /usr/src/app/package.json
 COPY yarn.lock /usr/src/app/yarn.lock
 RUN cd /usr/src/app && yarn --silent
 
 # Install web dependencies
-COPY web/package.json /usr/src/app/web/package.json
-COPY web/yarn.lock /usr/src/app/web/yarn.lock
+COPY web /usr/src/app/web
 RUN cd /usr/src/app/web && yarn --silent
 
 # Start app

diff --git a/client/react-native/docker-compose.yml b/client/react-native/docker-compose.yml
@@ -7,9 +7,7 @@ services:
     ports:
       - "3001:3000"
     volumes:
-      - .:/usr/src/app
-      - /usr/src/app/node_modules
-      - /usr/src/app/web/node_modules
+      - ./common:/usr/src/app/common
 
   tracer-service:
     image: jaegertracing/all-in-one:1.6