Category and performance merge

.gitignore

@@ -55,3 +55,6 @@ pids
 
 # Diagnostic reports (https://nodejs.org/api/report.html)
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+#package-lock.json
+package-lock.json

Dockerfile

@@ -8,7 +8,8 @@ RUN npm install \
       && npm run build
 
 # ssh
-ENV SSH_PASSWD "root:Docker!"
+ARG SSH_PASSWD
+ENV SSH_PASSWD $SSH_PASSWD
 RUN apt-get update \
       && apt-get install -y --no-install-recommends dialog \
       && apt-get update \
@@ -17,4 +18,6 @@ RUN apt-get update \
 
 COPY sshd_config /etc/ssh/
 
-ENTRYPOINT ["/bin/bash", "./start.sh"]
+EXPOSE 2222
+
+ENTRYPOINT ["/bin/bash", "./start.sh"]

azure-pipeline.yml

@@ -55,18 +55,26 @@ stages:
             -Dsonar.host.url=$(SONAR_HOST) \
             -Dsonar.javascript.lcov.reportPaths=./coverage/lcov.info \
             -Dsonar.exclusions=**/*/*.spec.ts,**/prisma/**   
-  - job: Build
+  - job: BuildAndPush
     dependsOn: Test
     steps:
     - task: Docker@2
       displayName: Build image
       inputs:
-        command: buildAndPush
-        repository: $(imageRepository)
-        containerRegistry: $(dockerRegistryServiceConnection)
-        dockerfile: $(dockerfilePath)
-        tags: |
-          $(tag)
+        containerRegistry: '$(dockerRegistryServiceConnection)'
+        repository: '$(imageRepository)'
+        command: 'build'
+        Dockerfile: '**/Dockerfile'
+        tags: '$(tag)'
+        arguments: 
+          --build-arg=SSH_PASSWD=$(SSH_PASSWD)
+    - task: Docker@2
+      displayName: Push image
+      inputs:
+        containerRegistry: '$(dockerRegistryServiceConnection)'
+        repository: '$(imageRepository)'
+        command: 'push'
+        tags: '$(tag)'
 - stage: dev_deploy
   displayName: Deploy To Development
   dependsOn: build_test
@@ -140,4 +148,4 @@ stages:
         DockerNamespace: 'uniconnectacr.azurecr.io'
         DockerRepository: 'main/giga-meter-backend'
         DockerImageTag: '$(Build.BuildId)'
-        AppSettings: '-DAILY_CHECK_APP_API_CODE $(DAILY_CHECK_APP_API_CODE) -DATABASE_URL $(DATABASE_URL) -PCDC_APP_DOWNLOAD_URL $(PCDC_APP_DOWNLOAD_URL) -PROJECT_CONNECT_SERVICE_URL $(PROJECT_CONNECT_SERVICE_URL) -SENTRY_DSN $(SENTRY_DSN) -USE_AUTH $(USE_AUTH) -WEBSITES_PORT $(WEBSITES_PORT) -NODE_ENV $(NODE_ENV)'
+        AppSettings: '-DAILY_CHECK_APP_API_CODE $(DAILY_CHECK_APP_API_CODE) -DATABASE_URL $(DATABASE_URL) -PCDC_APP_DOWNLOAD_URL $(PCDC_APP_DOWNLOAD_URL) -PROJECT_CONNECT_SERVICE_URL $(PROJECT_CONNECT_SERVICE_URL) -SENTRY_DSN $(SENTRY_DSN) -USE_AUTH $(USE_AUTH) -WEBSITES_PORT $(WEBSITES_PORT) -NODE_ENV $(NODE_ENV)'