Merge pull request #138 from wurstbrot/feat/angular-docker

Feat/angular docker

Author: wurstbrot

.github/workflows/main.yml

@@ -22,11 +22,13 @@ jobs:
           password: ${{ secrets.HUB_TOKEN }}
       - name: create and push an image
         run: |
-          chmod +x ./build.sh
           if [ "${GITHUB_REF##*/}" == "master" ]; then
-            VERSION="2.5.${GITHUB_RUN_NUMBER}"
+            VERSION="3.0.${GITHUB_RUN_NUMBER}"
           else
             BRANCH_TO_DOCKER=$(echo ${GITHUB_REF##*/} | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9._-]//g')
             VERSION="${BRANCH_TO_DOCKER}-${GITHUB_RUN_NUMBER}"
           fi
-          sudo ./build.sh "registry.hub.docker.com" "wurstbrot" "dsomm" "${VERSION}" "${{ secrets.HUB_USERNAME }}" "${{ secrets.HUB_TOKEN }}"
+          sudo docker build -t wurstbrot/dsomm:latest .
+          sudo docker push wurstbrot/dsomm:latest
+          sudo docker tag  wurstbrot/dsomm:${VERSION}
+          sudo docker push wurstbrot/dsomm:${VERSION}

.github/workflows/test.yml

@@ -0,0 +1,10 @@
+FROM node:18.7-alpine AS build
+WORKDIR /usr/src/app
+COPY package.json package-lock.json ./
+RUN npm install
+COPY . .
+RUN npm run build
+
+FROM bitnami/nginx:latest
+#COPY nginx.conf /etc/nginx/nginx.conf
+COPY --from=build /usr/src/app/dist/dsomm/ /app

Dockerfile

@@ -38,7 +38,7 @@
                 {
                   "type": "initial",
                   "maximumWarning": "500kb",
-                  "maximumError": "1mb"
+                  "maximumError": "2mb"
                 },
                 {
                   "type": "anyComponentStyle",

angular.json

@@ -47,7 +47,7 @@ export class MatrixComponent implements OnInit {
 
    // function to initialize if level columns exists
    ngOnInit(): void {
-    this.yaml.setURI('./assets/YAML/sample.yaml');
+    this.yaml.setURI('./assets/YAML/meta.yaml');
     // Function sets column header
     this.yaml.getJson().subscribe((data) => {
       this.YamlObject = data;
@@ -64,7 +64,7 @@ export class MatrixComponent implements OnInit {
     });
 
     //gets value from generated folder 
-    this.yaml.setURI('./assets/YAML/generated/sample.yaml');
+    this.yaml.setURI('./assets/YAML/generated/generated.yaml');
     // Function sets data 
     this.yaml.getJson().subscribe((data) => {
       this.YamlObject = data;