Skip to content

Commit

Permalink
Merge pull request #77 from drcgjung/fix/sparql-aas-docker-build-phase
Browse files Browse the repository at this point in the history
fix: reference to an outdated curl package in the build container
  • Loading branch information
almadigabor authored Jul 31, 2024
2 parents 66ad98b + db6faeb commit b5d775b
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ jobs:
type=semver,pattern={{version}}
type=semver,pattern={{major}}
type=semver,pattern={{major}}.{{minor}}
type=raw,value=1.13.7-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
type=raw,value=1.14.23-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
# build in any case, but push only main and version tag settings
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ kubectl wait --namespace ingress-nginx \
--selector=app.kubernetes.io/component=controller \
--timeout=90s
# transfer images
kind load docker-image docker.io/tractusx/aas-bridge:1.13.7-SNAPSHOT --name ka
kind load docker-image docker.io/tractusx/aas-bridge:1.14.23-SNAPSHOT --name ka
# run container test
ct install --charts charts/aas-bridge
```
Expand Down
4 changes: 2 additions & 2 deletions charts/aas-bridge/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ home: https://github.com/eclipse-tractusx/knowledge-agents-aas-bridge/
sources:
- https://github.com/eclipse-tractusx/knowledge-agents-aas-bridge/tree/main/sparql-aas
type: application
appVersion: "1.13.7-SNAPSHOT"
version: 1.13.7-SNAPSHOT
appVersion: "1.14.23-SNAPSHOT"
version: 1.14.23-SNAPSHOT
maintainers:
- name: 'Tractus-X Knowledge Agents Team'
4 changes: 2 additions & 2 deletions charts/aas-bridge/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

# aas-bridge

![Version: 1.13.7-SNAPSHOT](https://img.shields.io/badge/Version-0.13.6--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.13.7-SNAPSHOT](https://img.shields.io/badge/AppVersion-0.13.6--SNAPSHOT-informational?style=flat-square)
![Version: 1.14.23-SNAPSHOT](https://img.shields.io/badge/Version-0.13.6--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.14.23-SNAPSHOT](https://img.shields.io/badge/AppVersion-0.13.6--SNAPSHOT-informational?style=flat-square)

A Helm chart for the Tractus-X Knowledge Agents AAS Bridge which is a container to provide an AAS server/registry on top of a knowledge graph/SPARQL landscape.

Expand All @@ -32,7 +32,7 @@ This chart has no prerequisites.
## TL;DR
```shell
$ helm repo add eclipse-tractusx https://eclipse-tractusx.github.io/charts/dev
$ helm install my-release eclipse-tractusx/aas-bridge --version 1.13.7-SNAPSHOT
$ helm install my-release eclipse-tractusx/aas-bridge --version 1.14.23-SNAPSHOT
```

## Maintainers
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.tractusx.agents</groupId>
<artifactId>aas</artifactId>
<version>1.13.7-SNAPSHOT</version>
<version>1.14.23-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Tractus-X Knowledge Agents AAS Bridges</name>
<description>Provides Implementations for Bridging Knowledge Agents and AAS</description>
Expand Down
4 changes: 2 additions & 2 deletions sparql-aas/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ mvn -s ../../../settings.xml install -Pwith-docker-image
Alternatively, after a sucessful [build](#building) the docker image of the Sparql-To-AAS bridge is created using

```console
docker build -t tractusx/aas-bridge:1.13.7-SNAPSHOT -f src/main/docker/Dockerfile .
docker build -t tractusx/aas-bridge:1.14.23-SNAPSHOT -f src/main/docker/Dockerfile .
```

To run the docker image against a local knowledge graph, you could invoke this command
Expand All @@ -97,7 +97,7 @@ docker run -p 8443:8443 \
-v $(pwd)/resources:/app/resources \
-e "PROVIDER_SPARQL_ENDPOINT=http://oem-provider-agent:8082/sparql" \
-e "PROVIDER_CREDENTIAL_BASIC=Basic Zm9vOg==" \
tractusx/aas-bridge:1.13.7-SNAPSHOT
tractusx/aas-bridge:1.14.23-SNAPSHOT
````

Afterwards, you should be able to access the [local AAS endpoint](https://localhost:8443/) via REST
Expand Down
2 changes: 1 addition & 1 deletion sparql-aas/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.eclipse.tractusx.agents</groupId>
<artifactId>aas</artifactId>
<version>1.13.7-SNAPSHOT</version>
<version>1.14.23-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion sparql-aas/src/main/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-in

HEALTHCHECK NONE

RUN apk update && apk add curl=8.5.0-r0 --no-cache
RUN apk update && apk add curl=8.9.0-r0 --no-cache
RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar

FROM eclipse-temurin:22_36-jre-alpine
Expand Down
2 changes: 1 addition & 1 deletion upgrade_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#
# SPDX-License-Identifier: Apache-2.0

OLD_VERSION=1.13.7-SNAPSHOT
OLD_VERSION=1.14.23-SNAPSHOT
echo Upgrading from $OLD_VERSION to $1
PATTERN=s/$OLD_VERSION/$1/g
LC_ALL=C
Expand Down

0 comments on commit b5d775b

Please sign in to comment.