Merge branch 'master' into feat/add-lastPasswordChangeAt-to-users

.env.template

@@ -1,7 +1,7 @@
 APP_SEGMENT_KEY=LT12AvUt4u1NgNA751gYXdJ1Dvf0dmqx
 AVATAR_ACCESS_KEY=internxt
 AVATAR_BUCKET=avatars
-AVATAR_ENDPOINT=http://s3:9000
+AVATAR_ENDPOINT=http://network-storage:9000
 AVATAR_ENDPOINT_REWRITE_FOR_SIGNED_URLS=http://localhost:9000
 AVATAR_FORCE_PATH_STYLE=true
 AVATAR_REGION=
@@ -20,10 +20,10 @@ JWT_SECRET=38FTANE5LY90NHYZ
 MAGIC_IV=d139cb9a2cd17092e79e1861cf9d7023
 MAGIC_SALT=38dce0391b49efba88dbc8c39ebf868f0267eb110bb0012ab27dc52a528d61b1d1ed9d76f400ff58e3240028442b1eab9bb84e111d9dadd997982dbde9dbd25e
 NODE_ENV=development
-NOTIFICATIONS_URL=http://localhost:3000
+NOTIFICATIONS_URL=http://notifications:4000
 NOTIFICATIONS_API_KEY=secret
 RDS_DBNAME=xCloud
-RDS_HOSTNAME=postgres
+RDS_HOSTNAME=drive-database
 RDS_PASSWORD=example
 RDS_PORT=5432
 RDS_USERNAME=postgres
@@ -33,8 +33,8 @@ SENDGRID_NAME=
 DRIVE_VERIFY_ACCOUNT_TEMPLATE_ID=
 DRIVE_INVITE_FRIEND_TEMPLATE_ID=
 SESSION_KEY=t&jJr8N{D:u6fkFK
-STORJ_BRIDGE_HTTPS=http://bridge:6382
-STORJ_BRIDGE=http://bridge:6382
+STORJ_BRIDGE_HTTPS=http://network-api:6382
+STORJ_BRIDGE=http://network-api:6382
 STRIPE_SK=sk_test_F3Ny2VGUnPga9FtyXkl7mzPc
 STRIPE_SK_TEST=sk_test_R3Ny2VG7nPgeJFrtXdt8mrPc
 SENDGRID_MODE_SANDBOX=false

.github/workflows/build-and-deploy.yml

@@ -30,13 +30,6 @@ jobs:
           file: ./Dockerfile
           push: true
           tags: ${{ secrets.DOCKERHUB_USERNAME }}/drive-server:${{ github.sha }}
-      - name: Build and push to desktop-server
-        uses: docker/build-push-action@v2
-        with:
-          context: ./
-          file: ./Dockerfile
-          push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/desktop-server:${{ github.sha }}
   deploy:
     needs: build
     runs-on: ubuntu-latest
@@ -53,18 +46,5 @@ jobs:
         uses: steebchen/[email protected]
         with:
           config: ${{ secrets.KUBE_CONFIG_DATA }}
-          version: v1.20.2 # specify kubectl binary version explicitly
+          version: v1.25.9 # specify kubectl binary version explicitly
           command: rollout status deployment/drive-server
-
-      - uses: actions/checkout@master
-      - name: Update desktop-server image
-        uses: steebchen/[email protected]
-        with:
-          config: ${{ secrets.KUBE_CONFIG_DATA }}
-          command: set image --record deployment/desktop-server desktop-server=${{ secrets.DOCKERHUB_USERNAME }}/desktop-server:${{ github.sha }}
-      - name: Verify desktop-server deployment
-        uses: steebchen/[email protected]
-        with:
-          config: ${{ secrets.KUBE_CONFIG_DATA }}
-          version: v1.20.2
-          command: rollout status deployment/desktop-server

.github/workflows/build.yml

@@ -0,0 +1,20 @@
+name: Build
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types: [opened, synchronize, reopened]
+jobs:
+  sonarcloud:
+    name: SonarCloud
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - name: SonarCloud Scan
+        uses: SonarSource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

Dockerfile

@@ -1,18 +1,18 @@
-FROM mhart/alpine-node:14
+FROM node:14
 LABEL author="internxt"
 
 WORKDIR /drive-server
 
 # Add useful packages
-RUN apk add git curl
+# RUN apk add git curl
 
 COPY . .
 
 # Install deps
 RUN yarn && yarn build && yarn --production && yarn cache clean
 
 # Create prometheus directories
-RUN mkdir -p /mnt/prometheusvol{1,2}
+# RUN mkdir -p /mnt/prometheusvol{1,2}
 
 # Start server
-CMD node /drive-server/build/app.js
+CMD node /drive-server/build/app.js