Fix Dockerfile
Update .dockerignore
Change-Id: If46b54b61f9042e6276a396340f0decfd6f94282
diff --git a/.dockerignore b/.dockerignore
index 877b47e..d7ab78a 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,14 +1,13 @@
-.git/
+**/.git/
-.idea/
-.vscode/
+**/.idea/
+**/.vscode/
-node_modules/
-dist/
+**/node_modules/
+**/dist/
+**/.env*
+**/tsconfig.tsbuildinfo
+
daemon/
-.env*
dring.node
jamid.node
-
-client/dist/
-client/node_modules/
diff --git a/Dockerfile b/Dockerfile
index c827f7d..f7b9c5d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,9 +13,11 @@
RUN ln -s /daemon/bin/nodejs/build/Release/jamid.node jamid.node
COPY package*.json ./
+COPY common/package*.json common/
COPY client/package*.json client/
+COPY server/package*.json server/
-RUN npm ci
+RUN npm ci --ignore-scripts
COPY . .
diff --git a/README.md b/README.md
index 6eab9d8..e100b6b 100644
--- a/README.md
+++ b/README.md
@@ -40,6 +40,7 @@
docker build --tag jami-web .
docker run -it \
-p 3000:3000 \
+ -p 5000:5000 \
--volume $(pwd)/client:/web-client/client \
jami-web
```
diff --git a/docker-compose.yml b/docker-compose.yml
index 965f2a9..40fcd77 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,6 +16,7 @@
- /web-client/client/dist
ports:
- "3000:3000"
+ - "5000:5000"
stdin_open: true
depends_on:
- jami-daemon