From 7982056456a8d847590886502d13ca391f7463d7 Mon Sep 17 00:00:00 2001 From: Timo Pagel Date: Fri, 29 Jul 2022 14:42:31 +0200 Subject: [PATCH 1/4] add dockerfile and build --- .github/workflows/main.yml | 7 +++++-- Dockerfile | 10 ++++++++++ angular.json | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 Dockerfile diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ba41dca52..2eb1abf14 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,9 +24,12 @@ jobs: 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} diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..ae32d12ef --- /dev/null +++ b/Dockerfile @@ -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 \ No newline at end of file diff --git a/angular.json b/angular.json index 9b2a33219..549ff3fe8 100644 --- a/angular.json +++ b/angular.json @@ -38,7 +38,7 @@ { "type": "initial", "maximumWarning": "500kb", - "maximumError": "1mb" + "maximumError": "2mb" }, { "type": "anyComponentStyle", From f817d5c704b7037541d29b6379cb00974171b44a Mon Sep 17 00:00:00 2001 From: Timo Pagel Date: Fri, 29 Jul 2022 14:43:39 +0200 Subject: [PATCH 2/4] remove old test.sh --- .github/workflows/test.yml | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index 196963cd2..000000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: Test -on: [push, pull_request] -jobs: - test: - name: Test Code - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1.0.0 - - name: test code - run: | - chmod +x ./tests.sh - sudo apt install -y php - ./tests.sh - From 56d3dfc1eaff20601079888df41357226edbb088 Mon Sep 17 00:00:00 2001 From: Timo Pagel Date: Fri, 29 Jul 2022 14:45:12 +0200 Subject: [PATCH 3/4] fix: remove build.sh --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2eb1abf14..1023d95c7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,7 +22,6 @@ jobs: password: ${{ secrets.HUB_TOKEN }} - name: create and push an image run: | - chmod +x ./build.sh if [ "${GITHUB_REF##*/}" == "master" ]; then VERSION="3.0.${GITHUB_RUN_NUMBER}" else From daa87de32cde1e27f1c1752d4075bbce462080fb Mon Sep 17 00:00:00 2001 From: Timo Pagel Date: Fri, 29 Jul 2022 14:49:43 +0200 Subject: [PATCH 4/4] rename yamls --- src/app/component/matrix/matrix.component.ts | 4 ++-- src/assets/YAML/generated/{sample.yaml => generated.yaml} | 0 src/assets/YAML/{sample.yaml => meta.yaml} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename src/assets/YAML/generated/{sample.yaml => generated.yaml} (100%) rename src/assets/YAML/{sample.yaml => meta.yaml} (100%) diff --git a/src/app/component/matrix/matrix.component.ts b/src/app/component/matrix/matrix.component.ts index e7aa8901c..fe5ed206f 100644 --- a/src/app/component/matrix/matrix.component.ts +++ b/src/app/component/matrix/matrix.component.ts @@ -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; diff --git a/src/assets/YAML/generated/sample.yaml b/src/assets/YAML/generated/generated.yaml similarity index 100% rename from src/assets/YAML/generated/sample.yaml rename to src/assets/YAML/generated/generated.yaml diff --git a/src/assets/YAML/sample.yaml b/src/assets/YAML/meta.yaml similarity index 100% rename from src/assets/YAML/sample.yaml rename to src/assets/YAML/meta.yaml