diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yml index ea4c1a3..6d38e21 100644 --- a/.gitea/workflows/dev.yml +++ b/.gitea/workflows/dev.yml @@ -48,5 +48,9 @@ jobs: env: REGISTRY: git.4nkweb.com run: | - DOCKER_TAG=$(git rev-parse --abbrev-ref HEAD) + BR=$(git rev-parse --abbrev-ref HEAD) + # garde la dernière composante après '/' + DOCKER_TAG=${BR##*/} + # normalise en minuscules et remplace les chars invalides par '-' + DOCKER_TAG=$(printf "%s" "$DOCKER_TAG" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9_.-]/-/g') bash scripts/build_and_push.sh "$DOCKER_TAG" diff --git a/scripts/build_and_push.sh b/scripts/build_and_push.sh index 39d9bd2..69acf50 100644 --- a/scripts/build_and_push.sh +++ b/scripts/build_and_push.sh @@ -73,7 +73,7 @@ for name in "${submodules[@]}"; do log_file="${LOG_DIR}/${image_name_variant}.log" echo "[docker] build ${full_ref_variant} depuis ${df_dir} (branche ${branch}) | log: ${log_file}" { - echo "== BUILD ${full_ref_variant} ==" + echo "== BUILD+PUSH ${full_ref_variant} ==" echo "context=${df_dir} dockerfile=${df}" date -Is docker buildx build \ @@ -82,16 +82,10 @@ for name in "${submodules[@]}"; do --progress=plain \ --file "${df}" \ --tag "${full_ref_variant}" \ + --push \ "${df_dir}" } 2>&1 | tee -a "${log_file}" - echo "[docker] push ${full_ref_variant} | log: ${log_file}" - { - echo "== PUSH ${full_ref_variant} ==" - date -Is - docker push "${full_ref_variant}" - } 2>&1 | tee -a "${log_file}" - echo "${full_ref_variant} ${log_file}" >> "${SUMMARY_FILE}" done done