From 5cef4b4300f82b13db5fb890c6469f3003694358 Mon Sep 17 00:00:00 2001 From: AlexanderWollbrink <68860592+AlexanderWollbrink@users.noreply.github.com> Date: Wed, 13 Sep 2023 09:54:19 +0200 Subject: [PATCH 1/5] Creating workflow for DockerHub --- ...ild-and-publish-docker-images-workflow.yml | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/build-and-publish-docker-images-workflow.yml diff --git a/.github/workflows/build-and-publish-docker-images-workflow.yml b/.github/workflows/build-and-publish-docker-images-workflow.yml new file mode 100644 index 00000000..e68e33b1 --- /dev/null +++ b/.github/workflows/build-and-publish-docker-images-workflow.yml @@ -0,0 +1,25 @@ +name: Build-and-publish-docker-images-workflow + +on: + push: + + release: + types: [published] + +jobs: + Build-and-publish-docker-images: + runs-on: ubuntu-latest + steps: + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build and push All in One image + uses: docker/build-push-action@v5 + with: + file: ./Dockerfile + context: . + push: true + tags: fraunhoferiosb/aasportal_aio:latest From f5b698de1ed5b4e1f50f0239ebaf3dcdd38b5275 Mon Sep 17 00:00:00 2001 From: AlexanderWollbrink <68860592+AlexanderWollbrink@users.noreply.github.com> Date: Wed, 13 Sep 2023 09:56:22 +0200 Subject: [PATCH 2/5] Update build-and-publish-docker-images-workflow.yml --- .github/workflows/build-and-publish-docker-images-workflow.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-and-publish-docker-images-workflow.yml b/.github/workflows/build-and-publish-docker-images-workflow.yml index e68e33b1..e0590c4d 100644 --- a/.github/workflows/build-and-publish-docker-images-workflow.yml +++ b/.github/workflows/build-and-publish-docker-images-workflow.yml @@ -10,6 +10,8 @@ jobs: Build-and-publish-docker-images: runs-on: ubuntu-latest steps: + - uses: actions/checkout@master + - name: Login to Docker Hub uses: docker/login-action@v3 with: From 9772533308dee5fa66cc7f1307ece5a009faac84 Mon Sep 17 00:00:00 2001 From: AlexanderWollbrink Date: Wed, 13 Sep 2023 10:57:22 +0200 Subject: [PATCH 3/5] fixing version issues, probably? --- package-lock.json | 26 +++++++++++++------------- projects/aas-lib/package.build.json | 4 ++-- projects/aas-lib/package.dev.json | 4 ++-- projects/aas-lib/package.json | 4 ++-- projects/aas-portal/package.json | 4 ++-- projects/aas-server/package.json | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4942e576..6ddfe6ce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "aas-portal-project", - "version": "2.26.29", + "version": "3.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "aas-portal-project", - "version": "2.26.29", + "version": "3.0.0", "license": "Apache-2.0", "workspaces": [ "./projects/common", @@ -31150,7 +31150,7 @@ } }, "projects/aas-lib": { - "version": "2.0.0", + "version": "3.0.0", "peerDependencies": { "@angular/animations": "^16.1.8", "@angular/common": "^16.1.8", @@ -31168,11 +31168,11 @@ "@ngx-translate/http-loader": "^8.0.0", "@popperjs/core": "^2.11.8", "@xmldom/xmldom": "^0.8.10", - "aas-lib": "2.0.0", + "aas-lib": "3.0.0", "bootstrap": "^5.3.1", "bootstrap-icons": "^1.10.5", "chart.js": "^4.3.3", - "common": "2.0.0", + "common": "3.0.0", "jwt-decode": "^3.1.2", "lodash-es": "^4.17.21", "rxjs": "~7.8.1", @@ -31181,7 +31181,7 @@ } }, "projects/aas-portal": { - "version": "2.0.0", + "version": "3.0.0", "license": "Apache-2.0", "dependencies": { "@angular/animations": "^16.1.8", @@ -31200,11 +31200,11 @@ "@ngx-translate/http-loader": "^8.0.0", "@popperjs/core": "^2.11.8", "@xmldom/xmldom": "^0.8.10", - "aas-lib": "2.0.0", + "aas-lib": "3.0.0", "bootstrap": "^5.3.1", "bootstrap-icons": "^1.10.5", "chart.js": "^4.3.3", - "common": "2.0.0", + "common": "3.0.0", "jwt-decode": "^3.1.2", "lodash-es": "^4.17.21", "rxjs": "~7.8.1", @@ -31250,7 +31250,7 @@ "dependencies": { "@xmldom/xmldom": "^0.8.10", "bcryptjs": "^2.4.3", - "common": "2.0.0", + "common": "3.0.0", "cors": "^2.8.5", "express": "^4.18.2", "form-data": "^4.0.0", @@ -31313,7 +31313,7 @@ "dev": true }, "projects/common": { - "version": "2.0.0", + "version": "3.0.0", "license": "Apache-2.0", "peerDependencies": { "lodash-es": "^4.17.21" @@ -36750,11 +36750,11 @@ "@typescript-eslint/eslint-plugin": "^6.2.1", "@typescript-eslint/parser": "^6.2.1", "@xmldom/xmldom": "^0.8.10", - "aas-lib": "2.0.0", + "aas-lib": "3.0.0", "bootstrap": "^5.3.1", "bootstrap-icons": "^1.10.5", "chart.js": "^4.3.3", - "common": "2.0.0", + "common": "3.0.0", "eslint": "^8.46.0", "jasmine-core": "^5.1.0", "jest": "^29.6.2", @@ -36798,7 +36798,7 @@ "@xmldom/xmldom": "^0.8.10", "babel-plugin-transform-import-meta": "^2.2.1", "bcryptjs": "^2.4.3", - "common": "2.0.0", + "common": "3.0.0", "cors": "^2.8.5", "esbuild": "^0.18.19", "eslint": "^8.46.0", diff --git a/projects/aas-lib/package.build.json b/projects/aas-lib/package.build.json index d29d9702..2478f2df 100644 --- a/projects/aas-lib/package.build.json +++ b/projects/aas-lib/package.build.json @@ -29,11 +29,11 @@ "@ngx-translate/http-loader": "^8.0.0", "@popperjs/core": "^2.11.8", "@xmldom/xmldom": "^0.8.10", - "aas-lib": "2.0.0", + "aas-lib": "3.0.0", "bootstrap": "^5.3.1", "bootstrap-icons": "^1.10.5", "chart.js": "^4.3.3", - "common": "2.0.0", + "common": "3.0.0", "jwt-decode": "^3.1.2", "lodash-es": "^4.17.21", "rxjs": "~7.8.1", diff --git a/projects/aas-lib/package.dev.json b/projects/aas-lib/package.dev.json index 7b212e37..9e2f1f1c 100644 --- a/projects/aas-lib/package.dev.json +++ b/projects/aas-lib/package.dev.json @@ -42,11 +42,11 @@ "@ngx-translate/http-loader": "^8.0.0", "@popperjs/core": "^2.11.8", "@xmldom/xmldom": "^0.8.10", - "aas-lib": "2.0.0", + "aas-lib": "3.0.0", "bootstrap": "^5.3.1", "bootstrap-icons": "^1.10.5", "chart.js": "^4.3.3", - "common": "2.0.0", + "common": "3.0.0", "jwt-decode": "^3.1.2", "lodash-es": "^4.17.21", "rxjs": "~7.8.1", diff --git a/projects/aas-lib/package.json b/projects/aas-lib/package.json index 7b212e37..9e2f1f1c 100644 --- a/projects/aas-lib/package.json +++ b/projects/aas-lib/package.json @@ -42,11 +42,11 @@ "@ngx-translate/http-loader": "^8.0.0", "@popperjs/core": "^2.11.8", "@xmldom/xmldom": "^0.8.10", - "aas-lib": "2.0.0", + "aas-lib": "3.0.0", "bootstrap": "^5.3.1", "bootstrap-icons": "^1.10.5", "chart.js": "^4.3.3", - "common": "2.0.0", + "common": "3.0.0", "jwt-decode": "^3.1.2", "lodash-es": "^4.17.21", "rxjs": "~7.8.1", diff --git a/projects/aas-portal/package.json b/projects/aas-portal/package.json index 882d216c..2de067f9 100644 --- a/projects/aas-portal/package.json +++ b/projects/aas-portal/package.json @@ -32,11 +32,11 @@ "@ngx-translate/http-loader": "^8.0.0", "@popperjs/core": "^2.11.8", "@xmldom/xmldom": "^0.8.10", - "aas-lib": "2.0.0", + "aas-lib": "3.0.0", "bootstrap": "^5.3.1", "bootstrap-icons": "^1.10.5", "chart.js": "^4.3.3", - "common": "2.0.0", + "common": "3.0.0", "jwt-decode": "^3.1.2", "lodash-es": "^4.17.21", "rxjs": "~7.8.1", diff --git a/projects/aas-server/package.json b/projects/aas-server/package.json index 0fb24f27..3ecd04c7 100644 --- a/projects/aas-server/package.json +++ b/projects/aas-server/package.json @@ -21,7 +21,7 @@ "dependencies": { "@xmldom/xmldom": "^0.8.10", "bcryptjs": "^2.4.3", - "common": "2.0.0", + "common": "3.0.0", "cors": "^2.8.5", "express": "^4.18.2", "form-data": "^4.0.0", From 18192ab6d9977be3587980d03244e1e05666fb03 Mon Sep 17 00:00:00 2001 From: AlexanderWollbrink <68860592+AlexanderWollbrink@users.noreply.github.com> Date: Wed, 13 Sep 2023 11:14:13 +0200 Subject: [PATCH 4/5] including docker images for frontend and backend --- .../build-and-publish-docker-images-workflow.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/build-and-publish-docker-images-workflow.yml b/.github/workflows/build-and-publish-docker-images-workflow.yml index e0590c4d..94256b28 100644 --- a/.github/workflows/build-and-publish-docker-images-workflow.yml +++ b/.github/workflows/build-and-publish-docker-images-workflow.yml @@ -25,3 +25,19 @@ jobs: context: . push: true tags: fraunhoferiosb/aasportal_aio:latest + + - name: Build and push AASPortal (frontend) image + uses: docker/build-push-action@v5 + with: + file: ./Dockerfile.aas-portal + context: . + push: true + tags: fraunhoferiosb/aasportal_aasportal:latest + + - name: Build and push AASServer (backend) image + uses: docker/build-push-action@v5 + with: + file: ./Dockerfile.aas-server + context: . + push: true + tags: fraunhoferiosb/aasportal_aasserver:latest From 7cbb3f1259133f6ec1b754f380a9905fc80b311e Mon Sep 17 00:00:00 2001 From: Florian Pethig Date: Tue, 19 Sep 2023 14:24:54 +0200 Subject: [PATCH 5/5] Update usage.md Mistake in description of filtering properties --- docs/source/usage.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/usage.md b/docs/source/usage.md index ea5acc3b..77864340 100644 --- a/docs/source/usage.md +++ b/docs/source/usage.md @@ -61,11 +61,11 @@ All AAS that contain at least one property with the name *Producer* and the valu All AAS where *RotationSpeed* is greater or equal then *5000*: -`#Prop=RotationSpeed >= 5000` +`#Prop:RotationSpeed >= 5000` All AAS where *ProductionDate* is between *12/24/2022* and *12/31/2022*: -`#Prop=ProductionDate = 12/24/2022...12/31/2022` +`#Prop:ProductionDate = 12/24/2022...12/31/2022` ## Supported Endpoints