From 18a89eb37d5a4f1b77f4d6e284658e385a764b98 Mon Sep 17 00:00:00 2001
From: anima
Date: Wed, 29 Jan 2025 21:52:49 +0100
Subject: [PATCH] remove duble vars
---
gitea/workflows/docker-build.yml | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/gitea/workflows/docker-build.yml b/gitea/workflows/docker-build.yml
index d6cd440..91d0351 100644
--- a/gitea/workflows/docker-build.yml
+++ b/gitea/workflows/docker-build.yml
@@ -1,28 +1,22 @@
name: build container icinga2
on:
push:
- paths:
- - 'Dockerfile'
- - 'init.sh'
defaults:
run:
working-directory: ./icinga2
-env:
- REGISTRY_HOST: git.ao-it.net
- CONTAINER_TAG: ${{ gitea.repository }}
- CONTAINER_VERSION: latest
-
jobs:
deploy:
runs-on: test
steps:
- name: clone repo
working-directory: ${{ gitea.workspace }}
- run: git clone https://$TOKEN@${{ vars.AOIT_GIT_URL }}/${{ gitea.repository }}
+ run: git clone https://$TOKEN@$GIT_HOST/$GIT_REPO
env:
TOKEN: ${{ secrets.SERVICE_USER_TOKEN }}
+ GIT_HOST: ${{ vars.AOIT_GIT_URL }}
+ GIT_REPO: ${{ gitea.repository }}
- name: docker build
run: docker build -t $REGISTRY_HOST/$CONTAINER_TAG:$CONTAINER_VERSION .
- name: upload container ...
@@ -33,5 +27,8 @@ jobs:
env:
REGISTRY_USER: ${ secrets.REGISTRY_USER }
REGISTRY_PASS: ${ secrets.TOKEN_SVC_DOCKER }
+ REGISTRY_HOST: ${{ vars.AOIT_GIT_URL }}
+ CONTAINER_TAG: ${{ gitea.repository }}
+ CONTAINER_VERSION: latest
- name: docker cleanup image and layer ...
run: docker builder prune -af