diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index fcd04ea..830f446 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -27,17 +27,13 @@ jobs: - name: Build Dockerfile run: | docker build -t sd_telegram . - - name: Add new variables - run: | - package_name=$(basename ${{ github.repository }}) - commit_date=$(git log -1 --format=%cd --date=format:'%Y%m%d%H%M%S') - echo "package_name=$package_name, commit_date=$commit_date" - name: Upload Docker image to soaska.ru run: | package_name=$(basename ${{ github.repository }}) - commit_date=$(git log -1 --format=%cd --date=format:'%Y%m%d%H%M%S') + branch_name=$(git rev-parse --abbrev-ref HEAD | tr '[:upper:]' '[:lower:]') + docker login -u ${{ secrets.username }} -p ${{ secrets.password }} soaska.ru - docker tag sd_telegram soaska.ru/${{ secrets.username }}/$package_name:$commit_date + docker tag sd_telegram soaska.ru/${{ secrets.username }}/$package_name:$branch_name docker tag sd_telegram soaska.ru/${{ secrets.username }}/$package_name:latest - docker push soaska.ru/${{ secrets.username }}/$package_name:$commit_date + docker push soaska.ru/${{ secrets.username }}/$package_name:$branch_name docker push soaska.ru/${{ secrets.username }}/$package_name:latest \ No newline at end of file