fixed another bug in the docker build workflow, #2

3 files changed, 5 insertions, 76 deletions

diff --git a/.github/workflows/ant-build-release.yaml b/.github/workflows/ant-build-release.yaml
deleted file mode 100644
index 89d50ffcd..000000000
--- a/.github/workflows/ant-build-release.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-name: Build GitHub Release
-# This workflow builds the YaCy Search Server and creates a GitHub Release with the build artifacts.
-
-on:
-  # TODO: Currently disabled, because I'm not sure if this is the right way to do the release.
-  # push:
-  #   tags:
-  #     - "v*.*.*"
-  #     - "Release_*"
-  # pull_request:
-  workflow_dispatch:
-
-permissions:
-  contents: write
-  actions: write
-
-jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        #os: [macos-latest, ubuntu-latest, windows-latest]
-        os: [ubuntu-latest]
-
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - name: Check-out repository
-        uses: actions/checkout@v4
-
-      - name: Setup Java
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: '21'
-          cache: 'maven'
-
-      - name: Build
-        run: ant clean all dist
-
-      - name: Upload Artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ runner.os }} ${{ runner.arch }} Build
-          path: RELEASE/*
-
-      - name: Create GitHub Release
-        uses: softprops/action-gh-release@v2
-        if: startsWith(github.ref, 'refs/tags/')
-        with:
-          draft: true
-          generate_release_notes: true
-          files: RELEASE/*
diff --git a/.github/workflows/ant-build-selfhosted.yaml b/.github/workflows/ant-build-selfhosted.yaml
deleted file mode 100644
index 27d1e8dae..000000000
--- a/.github/workflows/ant-build-selfhosted.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: CI Script to build on self-hosted server
-
-# on: push
-
-jobs:
-  build:
-    runs-on: self-hosted
-    if: github.repository == 'yacy/yacy_search_server'
-    steps:
-    - uses: actions/checkout@master
-    - name: Set up JDK 11
-      uses: actions/setup-java@v3
-      with:
-        java-version: '11'
-        distribution: 'temurin'
-    - name: Build linux release
-      run: ant clean all dist
-
diff --git a/.github/workflows/build-docker-image.yaml b/.github/workflows/build-docker-image.yaml
index 64c73eef6..014ec3391 100644
--- a/.github/workflows/build-docker-image.yaml
+++ b/.github/workflows/build-docker-image.yaml
@@ -43,11 +43,11 @@ jobs:
             latest=${{ matrix.is_default }}
           tags: |
             type=raw,value=latest${{ matrix.suffix }},enable=${{ true }}
-	    type=raw,value=sha-${{ github.sha }}-${{ matrix.suffix }},enable=${{ true }}
-            type=raw,value={{version}}-${{ matrix.suffix }},enable=${{ startsWith(github.ref, 'refs/tags/') }}
-            type=raw,value={{major}}.{{minor}}-${{ matrix.suffix }},enable=${{ startsWith(github.ref, 'refs/tags/') }}
-            type=raw,value={{major}}-${{ matrix.suffix }},enable=${{ startsWith(github.ref, 'refs/tags/') }}
-
+            type=raw,value=sha-${{ github.sha }}${{ matrix.suffix }},enable=${{ true }}
+            type=raw,value=${{ "{{version}}" }}${{ matrix.suffix }},enable=${{ startsWith(github.ref, 'refs/tags/') }}
+            type=raw,value=${{ "{{major}}.{{minor}}" }}${{ matrix.suffix }},enable=${{ startsWith(github.ref, 'refs/tags/') }}
+            type=raw,value=${{ "{{major}}" }}${{ matrix.suffix }},enable=${{ startsWith(github.ref, 'refs/tags/') }}
+	    
       - name: Login to Docker Hub
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v3