fix: more docker related fixes

ever-co · Dec 6, 2021 · 94ad5c6 · 94ad5c6
1 parent 629c8e5
commit 94ad5c6
Show file tree

Hide file tree

Showing 28 changed files with 271 additions and 9 deletions.
diff --git a/.deploy/api/Dockerfile b/.deploy/api/Dockerfile
@@ -13,7 +13,7 @@ ARG DB_TYPE
 ARG DB_SSL_MODE
 ARG DEMO
 
-FROM node:16-alpine3.11 AS dependencies
+FROM node:16-alpine3.14 AS dependencies
 
 LABEL maintainer="ever@ever.co"
 
@@ -52,7 +52,7 @@ COPY --chown=node:node decorate-angular-cli.js lerna.json package.json yarn.lock
 RUN yarn install --frozen-lockfile && yarn cache clean
 # RUN apk del build-dependencies make gcc g++ python2 py2-setuptools vips-dev
 
-FROM node:16-alpine3.11 AS prodDependencies
+FROM node:16-alpine3.14 AS prodDependencies
 
 RUN apk --update add bash && \
     apk add --no-cache --virtual build-dependencies dos2unix gcc g++ git make python2 py2-setuptools vips-dev && \
@@ -84,7 +84,7 @@ RUN yarn install --frozen-lockfile --production && yarn cache clean
 
 RUN rm -r node_modules/@angular
 
-FROM node:16-alpine3.11 AS development
+FROM node:16-alpine3.14 AS development
 
 USER node:node
 
@@ -94,7 +94,7 @@ COPY --chown=node:node --from=dependencies /wait /entrypoint.prod.sh /entrypoint
 COPY --chown=node:node --from=dependencies /srv/gauzy .
 COPY . .
 
-FROM node:16-alpine3.11 AS build
+FROM node:16-alpine3.14 AS build
 
 WORKDIR /srv/gauzy
 
@@ -111,7 +111,7 @@ ENV IS_DOCKER=true
 RUN yarn build:package:api
 RUN yarn build:api:prod
 
-FROM node:16-alpine3.11 AS production
+FROM node:16-alpine3.14 AS production
 
 WORKDIR /srv/gauzy
 
@@ -130,7 +130,7 @@ COPY --chown=node:node --from=build /srv/gauzy/dist/apps/api .
 RUN npm install pm2 -g && \
     mkdir /import && chown node:node /import && \
     touch ormlogs.log && chown node:node ormlogs.log && chown node:node wait && \
-    chmod +x wait && chown -R node:node apps/
+    chmod +x wait entrypoint.compose.sh entrypoint.prod.sh && chown -R node:node apps/
 
 USER node:node
 
@@ -151,4 +151,6 @@ ENV DEMO=${DEMO:-false}
 
 EXPOSE ${API_PORT}
 
+ENTRYPOINT [ "./entrypoint.prod.sh" ]
+
 CMD [ "pm2-runtime", "main.js" ]
diff --git a/.deploy/webapp/Dockerfile b/.deploy/webapp/Dockerfile
@@ -17,7 +17,7 @@ ARG DEMO
 ARG WEB_HOST
 ARG WEB_PORT
 
-FROM node:16-alpine3.11 AS dependencies
+FROM node:16-alpine3.14 AS dependencies
 
 LABEL maintainer="ever@ever.co"
 
@@ -56,7 +56,7 @@ COPY --chown=node:node decorate-angular-cli.js lerna.json package.json yarn.lock
 RUN yarn install --frozen-lockfile && yarn cache clean
 # RUN apk del build-dependencies make gcc g++ python2 py2-setuptools vips-dev
 
-FROM node:16-alpine3.11 AS development
+FROM node:16-alpine3.14 AS development
 
 USER node:node
 
@@ -66,7 +66,7 @@ COPY --chown=node:node --from=dependencies /wait /entrypoint.compose.sh /entrypo
 COPY --chown=node:node --from=dependencies /srv/gauzy .
 COPY . .
 
-FROM node:16-alpine3.11 AS build
+FROM node:16-alpine3.14 AS build
 
 WORKDIR /srv/gauzy
 

diff --git a/.dockerignore b/.dockerignore
@@ -4,7 +4,9 @@ tmp
 .cache
 .github
 .circle
+.circleci
 .npmrc
+.husky
 .travis.yml
 greenkeeper.json
 docker-compose*.yml
@@ -16,9 +18,11 @@ Jenkinsfile
 node_modules
 apps/api/node_modules
 apps/desktop/node_modules
+apps/desktop-timer/node_modules
 apps/gauzy/node_modules
 apps/gauzy-e2e/node_modules
 packages/**/node_modules
+packages/plugins/**/node_modules
 
 # IDEs and editors
 .idea

diff --git a/apps/api/.dockerignore b/apps/api/.dockerignore
@@ -0,0 +1,11 @@
+.cache
+.git
+.gitignore
+.gitmodules
+README.md
+docker
+node_modules
+tmp
+build
+dist
+.env
diff --git a/apps/desktop-timer/.dockerignore b/apps/desktop-timer/.dockerignore
@@ -0,0 +1,11 @@
+.cache
+.git
+.gitignore
+.gitmodules
+README.md
+docker
+node_modules
+tmp
+build
+dist
+.env
diff --git a/apps/desktop/.dockerignore b/apps/desktop/.dockerignore
@@ -0,0 +1,11 @@
+.cache
+.git
+.gitignore
+.gitmodules
+README.md
+docker
+node_modules
+tmp
+build
+dist
+.env
diff --git a/apps/gauzy-e2e/.dockerignore b/apps/gauzy-e2e/.dockerignore
@@ -0,0 +1,11 @@
+.cache
+.git
+.gitignore
+.gitmodules
+README.md
+docker
+node_modules
+tmp
+build
+dist
+.env
diff --git a/apps/gauzy/.dockerignore b/apps/gauzy/.dockerignore
@@ -0,0 +1,11 @@
+.cache
+.git
+.gitignore
+.gitmodules
+README.md
+docker
+node_modules
+tmp
+build
+dist
+.env
diff --git a/apps/server/.dockerignore b/apps/server/.dockerignore
@@ -0,0 +1,11 @@
+.cache
+.git
+.gitignore
+.gitmodules
+README.md
+docker
+node_modules
+tmp
+build
+dist
+.env
diff --git a/packages/auth/.dockerignore b/packages/auth/.dockerignore
@@ -0,0 +1,10 @@
+.git
+.gitignore
+.gitmodules
+README.md
+docker
+node_modules
+tmp
+build
+dist
+.env
diff --git a/packages/common-angular/.dockerignore b/packages/common-angular/.dockerignore
@@ -0,0 +1,10 @@
+.git
+.gitignore
+.gitmodules
+README.md
+docker
+node_modules
+tmp
+build
+dist
+.env
diff --git a/packages/common/.dockerignore b/packages/common/.dockerignore
@@ -0,0 +1,10 @@
+.git
+.gitignore
+.gitmodules
+README.md
+docker
+node_modules
+tmp
+build
+dist
+.env
diff --git a/packages/config/.dockerignore b/packages/config/.dockerignore
@@ -0,0 +1,10 @@
+.git
+.gitignore
+.gitmodules
+README.md
+docker
+node_modules
+tmp
+build
+dist
+.env
diff --git a/packages/contracts/.dockerignore b/packages/contracts/.dockerignore
@@ -0,0 +1,10 @@
+.git
+.gitignore
+.gitmodules
+README.md
+docker
+node_modules
+tmp
+build
+dist
+.env
diff --git a/packages/core/.dockerignore b/packages/core/.dockerignore
@@ -0,0 +1,10 @@
+.git
+.gitignore
+.gitmodules
+README.md
+docker
+node_modules
+tmp
+build
+dist
+.env
diff --git a/packages/desktop-api/.dockerignore b/packages/desktop-api/.dockerignore
@@ -0,0 +1,10 @@
+.git
+.gitignore
+.gitmodules
+README.md
+docker
+node_modules
+tmp
+build
+dist
+.env
diff --git a/packages/desktop-libs/.dockerignore b/packages/desktop-libs/.dockerignore
@@ -0,0 +1,10 @@
+.git
+.gitignore
+.gitmodules
+README.md
+docker
+node_modules
+tmp
+build
+dist
+.env
diff --git a/packages/desktop-ui-lib/.dockerignore b/packages/desktop-ui-lib/.dockerignore
@@ -0,0 +1,10 @@
+.git
+.gitignore
+.gitmodules
+README.md
+docker
+node_modules
+tmp
+build
+dist
+.env
diff --git a/packages/desktop-window/.dockerignore b/packages/desktop-window/.dockerignore
@@ -0,0 +1,10 @@
+.git
+.gitignore
+.gitmodules
+README.md
+docker
+node_modules
+tmp
+build
+dist
+.env
diff --git a/packages/plugin/.dockerignore b/packages/plugin/.dockerignore
@@ -0,0 +1,10 @@
+.git
+.gitignore
+.gitmodules
+README.md
+docker
+node_modules
+tmp
+build
+dist
+.env
diff --git a/packages/plugins/.dockerignore b/packages/plugins/.dockerignore
@@ -0,0 +1,10 @@
+.git
+.gitignore
+.gitmodules
+README.md
+docker
+node_modules
+tmp
+build
+dist
+.env
diff --git a/packages/plugins/changelog/.dockerignore b/packages/plugins/changelog/.dockerignore
@@ -0,0 +1,10 @@
+.git
+.gitignore
+.gitmodules
+README.md
+docker
+node_modules
+tmp
+build
+dist
+.env
diff --git a/packages/plugins/integration-ai/.dockerignore b/packages/plugins/integration-ai/.dockerignore
@@ -0,0 +1,10 @@
+.git
+.gitignore
+.gitmodules
+README.md
+docker
+node_modules
+tmp
+build
+dist
+.env
diff --git a/packages/plugins/integration-hubstaff/.dockerignore b/packages/plugins/integration-hubstaff/.dockerignore
@@ -0,0 +1,10 @@
+.git
+.gitignore
+.gitmodules
+README.md
+docker
+node_modules
+tmp
+build
+dist
+.env
diff --git a/packages/plugins/integration-upwork/.dockerignore b/packages/plugins/integration-upwork/.dockerignore
@@ -0,0 +1,10 @@
+.git
+.gitignore
+.gitmodules
+README.md
+docker
+node_modules
+tmp
+build
+dist
+.env
diff --git a/packages/plugins/integration-wakatime/.dockerignore b/packages/plugins/integration-wakatime/.dockerignore
@@ -0,0 +1,10 @@
+.git
+.gitignore
+.gitmodules
+README.md
+docker
+node_modules
+tmp
+build
+dist
+.env
diff --git a/packages/plugins/knowledge-base/.dockerignore b/packages/plugins/knowledge-base/.dockerignore
@@ -0,0 +1,10 @@
+.git
+.gitignore
+.gitmodules
+README.md
+docker
+node_modules
+tmp
+build
+dist
+.env
diff --git a/packages/plugins/product-reviews/.dockerignore b/packages/plugins/product-reviews/.dockerignore
@@ -0,0 +1,10 @@
+.git
+.gitignore
+.gitmodules
+README.md
+docker
+node_modules
+tmp
+build
+dist
+.env