consumer project käyttöönotossa tulleitea muutoksia (#12)

Co-authored-by: moilanik <niko.moilanen@tietoevry.com>
Reviewed-on: #12

.gitea/workflows/check-version.yml

@@ -28,7 +28,16 @@ jobs:
 
       - name: Check existing artifact and calculate version
         run: |
-          RAW_VERSION=$(jq -r '.version' package.json)
+          if [ -f VERSION ]; then
+            RAW_VERSION=$(cat VERSION | tr -d '[:space:]')
+          elif [ -f package.json ]; then
+            RAW_VERSION=$(jq -r '.version' package.json)
+          elif [ -f pom.xml ]; then
+            RAW_VERSION=$(grep -oP '<version>\K[^<]+' pom.xml | head -1)
+          else
+            echo "ERROR: No VERSION file, package.json, or pom.xml found" >&2
+            exit 1
+          fi
           BASE_VERSION=$(echo "$RAW_VERSION" | cut -d'.' -f1-2)
           echo "gitea-ci-library - Tunnistettu Major.Minor versio: $BASE_VERSION"
 

.gitea/workflows/docker-build-push.yml

@@ -22,6 +22,7 @@ env:
   DOCKER_REGISTRY: ${{ fromJson(inputs.env_json).DOCKER_REGISTRY || '' }}
   DOCKER_IMAGE_NAME: ${{ fromJson(inputs.env_json).DOCKER_IMAGE_NAME || '' }}
   DOCKER_UI_URL: ${{ fromJson(inputs.env_json).DOCKER_UI_URL || '' }}
+  DOCKERFILE: ${{ fromJson(inputs.env_json).DOCKERFILE || 'Dockerfile' }}
   VERSION: ${{ inputs.version }}
 
 concurrency:
@@ -48,6 +49,7 @@ jobs:
             --label "git.commit=${{ github.sha }}" \
             --label "git.commitBy=${{ github.actor }}" \
             --label "build.date=${NOW}" \
+            -f "${DOCKERFILE}" \
             -t "${DOCKER_IMAGE_NAME}:${VERSION}" .
 
           REGISTRY="${DOCKER_REGISTRY:?DOCKER_REGISTRY not set in env.conf}"

.gitea/workflows/example-gitea-env.conf

@@ -3,3 +3,4 @@ GIT_PAGES_URL=https://ci-reports.helm-dev.keskikuja.site
 DOCKER_REGISTRY=gitea.app.keskikuja.site/niko
 DOCKER_IMAGE_NAME=gitea-ci-library-test-image
 DOCKER_UI_URL=https://gitea.app.keskikuja.site/niko/-/packages/container/gitea-ci-library-test-image
+#DOCKERFILE=Dockerfile.platform