diff --git a/.gitea/workflows/daily-docker.yml b/.gitea/workflows/daily-docker.yml index bdb05b9..83de406 100644 --- a/.gitea/workflows/daily-docker.yml +++ b/.gitea/workflows/daily-docker.yml @@ -67,19 +67,16 @@ jobs: - name: Docker Image bauen if: steps.check.outputs.should_build == 'true' run: | - docker build \ + docker buildx build \ + --provenance=false \ + --sbom=false \ --build-arg VDO_NINJA_REPO=${{ env.UPSTREAM_REPO }} \ --build-arg VDO_NINJA_REF=${{ steps.check.outputs.upstream_tag }} \ -t ${{ steps.check.outputs.registry }}/${{ secrets.REGISTRY_USER }}/${{ env.IMAGE_NAME }}:latest \ -t ${{ steps.check.outputs.registry }}/${{ secrets.REGISTRY_USER }}/${{ env.IMAGE_NAME }}:${{ steps.check.outputs.upstream_tag }} \ + --push \ . - - name: Docker Image pushen - if: steps.check.outputs.should_build == 'true' - run: | - docker push ${{ steps.check.outputs.registry }}/${{ secrets.REGISTRY_USER }}/${{ env.IMAGE_NAME }}:latest - docker push ${{ steps.check.outputs.registry }}/${{ secrets.REGISTRY_USER }}/${{ env.IMAGE_NAME }}:${{ steps.check.outputs.upstream_tag }} - - name: Build-Zusammenfassung if: always() run: | diff --git a/.gitignore b/.gitignore index fd530fa..7dbddb2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ # Geklonter VDO.Ninja Quellcode (wird nur im CI verwendet) vdo-ninja-source/ .vdo-ninja-source/ +.ki-workspace/ \ No newline at end of file diff --git a/README.md b/README.md index a009816..970d7b4 100644 --- a/README.md +++ b/README.md @@ -47,11 +47,20 @@ Eine fertige `docker-compose.yml` liegt im Repository: docker compose up -d ``` +Die Compose-Datei kann das Image bei Bedarf direkt aus dem lokalen Repository bauen: + +```bash +docker compose build +docker compose up -d +``` + Oder manuell erstellen: ```yaml services: vdo-ninja: + build: + context: . image: git.techniverse.net/scriptos/vdo-ninja:latest container_name: vdo-ninja restart: unless-stopped @@ -172,6 +181,12 @@ docker build \ . ``` +Das mit `docker build` erzeugte lokale Image kann anschließend auch per Compose gestartet werden: + +```bash +VDO_NINJA_IMAGE=vdo-ninja:v29.0 docker compose up -d +``` + --- ## 🛡️ Secrets & Variablen diff --git a/docker-compose.yml b/docker-compose.yml index 991809d..ec7db17 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,8 @@ services: vdo-ninja: - image: git.techniverse.net/scriptos/vdo-ninja:latest + build: + context: . + image: ${VDO_NINJA_IMAGE:-git.techniverse.net/scriptos/vdo-ninja:latest} container_name: vdo-ninja restart: unless-stopped ports: