diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml index 38814b6..6eaa58d 100644 --- a/.gitea/workflows/base-build.yml +++ b/.gitea/workflows/base-build.yml @@ -63,7 +63,7 @@ jobs: run: | IFS=' ' read -r -a versions <<< "$VERSIONS" for version in "${versions[@]}"; do - path="/output/$version/debian-$version.tar.bz2" + path="${{ env.OUTPUT_DIR }}/$version/debian-$version.tar.bz2" if [[ ! -f "$path" ]]; then echo "[ERROR] Missing archive: $path" exit 1 @@ -74,7 +74,8 @@ jobs: - name: Clone upload repo run: | - git clone "https://${{ env.GIT_USERNAME }}:${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}@gitea.fithwum.tech/fithwum/debian-base.git" upload-repo + GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}" + git clone "https://${{ env.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/debian-base.git" upload-repo - name: Clean old archives in upload-repo run: rm -rf upload-repo/*/*.tar.bz2 diff --git a/base-image-script/bootstrap-rootfs.sh b/base-image-script/bootstrap-rootfs.sh index dce007f..cc217a3 100644 --- a/base-image-script/bootstrap-rootfs.sh +++ b/base-image-script/bootstrap-rootfs.sh @@ -29,7 +29,6 @@ locale-gen update-locale LANG=en_US.UTF-8 apt-get remove --purge --allow-remove-essential pinentry-curses whiptail kmod iptables iproute2 dmidecode || true apt-get clean -apt-get install -f find /var/lib/apt/lists/ -type f -delete EOF