From f642daefade022291f1dc5e5211612af2368d9d9 Mon Sep 17 00:00:00 2001 From: Mandy Chessell Date: Fri, 21 Jun 2024 20:49:33 +0100 Subject: [PATCH] Remove quay.io from release Signed-off-by: Mandy Chessell --- .github/workflows/release-v5.yml | 18 ++++++------------ .../opentypes/OpenMetadataTypesArchive.java | 2 ++ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/release-v5.yml b/.github/workflows/release-v5.yml index 7d1aff330ae..99b32876e30 100644 --- a/.github/workflows/release-v5.yml +++ b/.github/workflows/release-v5.yml @@ -30,12 +30,6 @@ jobs: # Prep for docker builds - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - name: Login to container registry (Quay.io) - uses: docker/login-action@v3 - with: - registry: quay.io - username: ${{ secrets.QUAY_IO_USERNAME }} - password: ${{ secrets.QUAY_IO_ACCESS_TOKEN }} - name: Login to container registry (docker.io) uses: docker/login-action@v3 with: @@ -66,25 +60,25 @@ jobs: - name: Set Release version env variable run: | echo "VERSION=$(./gradlew properties --no-daemon --console=plain -q | grep '^version:' | awk '{printf $2}')" >> $GITHUB_ENV - # Publish container images(egeria-platform) to quay.io and docker.io + # Publish container images(egeria-platform) to docker.io - name: Copy the distribution content to be used in docker copy command run: | cp -f container.application.properties ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/application.properties mkdir -p ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-5.0-distribution.tar.gz/assembly/platform/data/servers cp -r ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/opt/sample-configs/*-* ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/data/servers - - name: Build and push(egeria-platform) to quay.io and docker.io + - name: Build and push(egeria-platform) to docker.io uses: docker/build-push-action@v5 with: push: true - tags: odpi/egeria-platform:${{ env.VERSION }}, odpi/egeria-platform:stable, quay.io/odpi/egeria-platform:${{ env.VERSION }}, quay.io/odpi/egeria-platform:stable + tags: odpi/egeria-platform:${{ env.VERSION }}, odpi/egeria-platform:stable, context: ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz platforms: linux/amd64,linux/arm64 - # Publish container images(egeria-configure) to quay.io and docker.io - - name: Build and push(egeria-configure) to quay.io and docker.io + # Publish container images(egeria-configure) to docker.io + - name: Build and push(egeria-configure) to docker.io uses: docker/build-push-action@v5 with: push: true - tags: odpi/egeria-configure:${{ env.VERSION }}, odpi/egeria-configure:stable, quay.io/odpi/egeria-configure:${{ env.VERSION }}, quay.io/odpi/egeria-configure:stable + tags: odpi/egeria-configure:${{ env.VERSION }}, odpi/egeria-configure:stable context: ./open-metadata-resources/open-metadata-deployment/docker/configure platforms: linux/amd64,linux/arm64 # Mostly for verification - not published to the release itself for now diff --git a/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive.java b/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive.java index edd48f44f2b..5a481703cdc 100644 --- a/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive.java +++ b/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive.java @@ -3409,6 +3409,7 @@ private RelationshipDef getUltimateSourceRelationship() end2AttributeDescription, end2AttributeDescriptionGUID, end2Cardinality); + relationshipDef.setMultiLink(true); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -3455,6 +3456,7 @@ private RelationshipDef getUltimateDestinationRelationship() descriptionGUID, classificationPropagationRule); + relationshipDef.setMultiLink(true); RelationshipEndDef relationshipEndDef; /*