Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
ralfaron committed Sep 21, 2023
2 parents 9a0ad58 + 7cbb3f1 commit b3cbd2a
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 2 deletions.
43 changes: 43 additions & 0 deletions .github/workflows/build-and-publish-docker-images-workflow.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Build-and-publish-docker-images-workflow

on:
push:

release:
types: [published]

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:
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

- 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
4 changes: 2 additions & 2 deletions docs/source/usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit b3cbd2a

Please sign in to comment.