diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index a5cb897..3d1a205 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -26,9 +26,6 @@ jobs: id: docker with: images: ${{ steps.repository.outputs.registry }}/${{ steps.repository.outputs.repository }} - tags: | - type=sha,prefix= - type=ref,event=tag - name: Login to registry uses: docker/login-action@v3 @@ -50,7 +47,3 @@ jobs: allow: network.host network: host tags: ${{ steps.docker.outputs.tags }} - - - name: Deploy - uses: ./.forgejo/workflows/deploy.yaml - if: startsWith(github.ref, 'refs/tags/v') diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 8fef05d..aafe9c6 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -1,7 +1,6 @@ name: deploy on: - workflow_call: workflow_dispatch: jobs: @@ -12,13 +11,6 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Replace Image Version - run: | - sha="${{ github.sha }}" - shortSha="${sha:0:7}" - echo "Setting image version to: edp.buildth.ing/devfw-cicd/edgeconnect-action-demo:${shortSha}" - sed -i "s@###IMAGETAG###@edp.buildth.ing/devfw-cicd/edgeconnect-action-demo:${shortSha}@g" ./k8s-deployment.yaml - - name: Deploy action uses: https://edp.buildth.ing/DevFW-CICD/edge-connect-deploy-action@main id: deploy diff --git a/k8s-deployment.yaml b/k8s-deployment.yaml index 15dd6d6..348b6f8 100644 --- a/k8s-deployment.yaml +++ b/k8s-deployment.yaml @@ -32,7 +32,7 @@ spec: volumes: containers: - name: edgeconnect-coder - image: ###IMAGETAG### + image: nginx:latest imagePullPolicy: Always ports: - containerPort: 80