Bring latest

.circleci/config.yml

@@ -1,4 +1,7 @@
-version: 2
+version: 2.1    
+
+orbs:
+    node: circleci/node@3.0.0
 
 aliases:
     - &install-chrome
@@ -16,11 +19,51 @@ defaults: &defaults
     working_directory: /tmp/workspace
 
 jobs:
+    sonarqube:
+        <<: *defaults
+        machine:
+            image: ubuntu-1604:202004-01
+        working_directory: /tmp/workspace/sonarqube-root
+        description: Check Code Quality with SonarQube
+        steps:
+            - checkout
+            - node/install:
+                install-yarn: true
+                node-version: latest
+            - restore_cache:
+                    name: Restore Yarn Package Cache
+                    keys:
+                        - yarn-packages-sonarqube-root-{{ checksum "yarn.lock" }}
+            - run:
+                    name: Install Dependencies
+                    command: yarn install
+            - run:
+                name: Install Sonarqube scanner
+                command: |
+                    wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.3.0.2102.zip
+                    unzip sonar-scanner-cli-4.3.0.2102.zip
+            - run:
+                name: Run Sonarscanner
+                command: |
+                    export SONAR_SCANNER_OPTS="-Xmx2048m"
+                    eval ./sonar-scanner-4.3.0.2102/bin/sonar-scanner -Dsonar.host.url=$SONAR_SERVER \
+                    -Dsonar.projectKey=gauzy \
+                    -Dsonar.sources=. \
+                    -Dsonar.login=$SONAR_TOKEN
+            - save_cache:
+                name: Save Yarn Package Cache
+                key: yarn-packages-sonarqube-root-{{ checksum "yarn.lock" }}
+                paths:
+                    - ~/.cache/yarn
+            - persist_to_workspace:
+                root: /tmp/workspace/sonarqube-root
+                paths:
+                    - '*'
     build-monorepo-root:
         <<: *defaults
         working_directory: /tmp/workspace/monorepo-root
         docker:
-            - image: circleci/node:13.12.0
+            - image: circleci/node:14.3.0
         steps:
             - checkout
             - run:
@@ -51,11 +94,49 @@ jobs:
                   root: /tmp/workspace/monorepo-root
                   paths:
                       - '*'
+    build-desktop:
+        <<: *defaults
+        working_directory: /tmp/workspace/desktop
+        docker:
+            - image: circleci/node:14.3.0
+        steps:
+            - checkout
+            - run:
+                  name: 'Installing latest Yarn'
+                  command: |
+                      # remove default yarn
+                      sudo rm -rf $(dirname $(which yarn))/yarn*
+                      # download latest
+                      rm -rf ~/.yarn
+                      curl -o- -L https://yarnpkg.com/install.sh | bash
+                      echo 'export PATH="${PATH}:${HOME}/.yarn/bin:${HOME}/.config/yarn/global/node_modules/.bin"' >> $BASH_ENV
+            - restore_cache:
+                  name: Restore Yarn Package Cache
+                  keys:
+                      - yarn-packages-desktop-{{ checksum "yarn.lock" }}
+            - run:
+                  name: Install Dependencies
+                  command: yarn install
+            - run:
+                  name: Run Bootstrap
+                  command: yarn bootstrap
+            - run:
+                  name: Run Build
+                  command: yarn build:desktop:linux
+            - save_cache:
+                  name: Save Yarn Package Cache
+                  key: yarn-packages-desktop-{{ checksum "yarn.lock" }}
+                  paths:
+                      - ~/.cache/yarn
+            - persist_to_workspace:
+                  root: /tmp/workspace/desktop
+                  paths:
+                      - '*'
     build-api:
         <<: *defaults
         working_directory: /tmp/workspace/api
         docker:
-            - image: circleci/node:13.12.0
+            - image: circleci/node:14.3.0
         steps:
             - checkout
             - run:
@@ -93,7 +174,7 @@ jobs:
         <<: *defaults
         working_directory: /tmp/workspace/web
         docker:
-            - image: circleci/node:13.12.0
+            - image: circleci/node:14.3.0
         steps:
             - checkout
             - run:
@@ -131,6 +212,8 @@ workflows:
     version: 2
     build_and_test:
         jobs:
+            - sonarqube
             - build-monorepo-root
             - build-web
             - build-api
+            - build-desktop

.deploy/api/Dockerfile

@@ -1,52 +1,71 @@
-# API
+# devependecies
+FROM node:alpine AS dependencies
 
-FROM node:alpine AS development
+RUN apk --update add bash && \
+    apk add --no-cache dos2unix g++ git make python vips-dev
+
+RUN mkdir /srv/gauzy && chown -R node:node /srv/gauzy
 
-RUN apk update \
-    && apk add libexecinfo libexecinfo-dev \
-    && npm i -g npm \
-    && apk --no-cache add --virtual builds-deps build-base \
-    snappy g++ snappy-dev gcc libgcc libstdc++ linux-headers autoconf automake make nasm python git \
-    && npm install --quiet node-gyp -g \ 
-    && npm config set python /usr/bin/python \
-    && npm install yarn@latest -g --force
+COPY wait .deploy/api/entrypoint /
+RUN chmod +x /wait /entrypoint
 
-RUN mkdir /srv/gauzy && chown node:node /srv/gauzy
+RUN dos2unix /entrypoint
 
-USER node
+USER node:node
 
 WORKDIR /srv/gauzy
 
+COPY --chown=node:node apps/desktop/package.json ./apps/desktop/
+COPY --chown=node:node apps/api/package.json ./apps/api/
 COPY --chown=node:node package.json yarn.lock ./
-COPY --chown=node:node apps/api/package.json ./apps/api/package.json
-# COPY .snyk /tmp/.snyk
+
 RUN yarn install
 
-FROM node:alpine AS production
+# development
+FROM node:alpine AS development
 
-ADD https://github.com/ufoscout/docker-compose-wait/releases/download/2.6.0/wait /wait
+USER node:node
 
-RUN npm install cross-env -g \
-    && npm install pm2 -g --unsafe-perm \
-    && chmod +x /wait
+WORKDIR /srv/gauzy
 
-RUN mkdir /srv/gauzy && chown node:node /srv/gauzy
-RUN mkdir /srv/gauzy/dist && chown node:node /srv/gauzy/dist
+COPY --chown=node:node --from=dependencies /wait /entrypoint /
+COPY --chown=node:node --from=dependencies /srv/gauzy .
+COPY . .
 
-USER node
+# build
+FROM node:alpine AS build
 
 WORKDIR /srv/gauzy
 
+RUN mkdir dist
+
+COPY --chown=node:node --from=development /srv/gauzy .
+
 ARG NODE_OPTIONS="--max-old-space-size=2048"
-ENV NODE_OPTIONS $NODE_OPTIONS
 ENV NODE_ENV production
 
-COPY --from=development --chown=root:root /srv/gauzy/node_modules ./node_modules
-COPY --from=development --chown=root:root /srv/gauzy/apps/api/node_modules ./apps/api/node_modules
+RUN yarn build:api:prod
 
-COPY . .
+# production
+FROM node:alpine AS production
+
+WORKDIR /srv/gauzy
+
+COPY --chown=node:node --from=dependencies /wait ./wait
+COPY --chown=node:node --from=dependencies /entrypoint .
+COPY --chown=node:node --from=dependencies /srv/gauzy/node_modules ./node_modules/
+COPY --chown=node:node apps/api/src/app/core/seeds/data/default-email-templates apps/api/src/app/core/seeds/data/default-email-templates
+COPY --chown=node:node --from=build /srv/gauzy/dist/apps/api .
 
-EXPOSE 3000
+RUN chown node:node wait && chmod +x wait && chown -R node:node apps/
+USER node:node
+
+ENV NODE_OPTIONS="--max-old-space-size=2048"
+ENV NODE_ENV production
+ENV DB_NAME postgres
+ENV API_PORT 3000
+ENV DB_PORT 5432
 
-CMD /wait \
-    && cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=2048 yarn ng serve api --host 0.0.0.0 -c=production --prod
+EXPOSE ${API_PORT:-3000}
+CMD [ "node", "main.js" ]
+ENTRYPOINT [ "./entrypoint" ]

.deploy/api/entrypoint

@@ -0,0 +1,10 @@
+#!/usr/bin/env sh
+set -eux
+
+export host=${host-0.0.0.0}
+export port=${API_PORT:-3000}
+export DB_HOST=${DB_HOST:-db}
+export WAIT_HOSTS=$DB_HOST:$DB_PORT
+
+./wait
+exec "$@"

.deploy/desktop/Dockerfile.linux

@@ -0,0 +1,31 @@
+FROM node:buster-slim as linux
+
+RUN mkdir -p /opt/src && chown -R node:node /opt/src && \
+    apt update && apt install -y --no-install-recommends \ 
+    curl gnupg git libappindicator3-1 ca-certificates binutils \
+    icnsutils graphicsmagick
+
+WORKDIR /opt/src
+
+COPY --chown=node:node apps/desktop/package.json ./apps/desktop/
+COPY --chown=node:node apps/api/package.json ./apps/api/
+COPY --chown=node:node package.json yarn.lock ./
+
+USER node:node
+
+RUN yarn install
+
+COPY --chown=node:node . .
+
+RUN yarn bootstrap
+
+RUN yarn build:desktop:linux
+
+#=========================================================================#
+
+FROM debian:buster-slim
+
+WORKDIR /opt/artifacts
+
+COPY --from=linux /opt/src/dist/apps/desktop-packages ./linux/
+

.deploy/desktop/Dockerfile.win

@@ -0,0 +1,23 @@
+FROM electronuserland/builder:wine as windows
+
+WORKDIR /opt/src
+
+COPY apps/desktop/package.json ./apps/desktop/
+COPY apps/api/package.json ./apps/api/
+COPY package.json yarn.lock ./
+
+RUN yarn install
+
+COPY . .
+
+RUN yarn bootstrap
+
+RUN yarn build:desktop:windows
+
+#=========================================================================#
+
+FROM debian:buster-slim
+
+WORKDIR /opt/artifacts
+
+COPY --from=windows /opt/src/dist/apps/desktop-packages ./windows/

.deploy/nginx/nginx.conf

@@ -17,15 +17,14 @@ http {
   }
 
   server {    
+    listen 8080;
+    location /api/ {
+        proxy_pass http://api;
+      }
 
-	location /api/ {
-      proxy_pass http://api;
-    }
-
     location / {
       proxy_pass http://webapp;      
     }
-
-	listen 8080;
+
   }
 }