From a75d6240b38ff7d9720ae784febcde1a2c45714e Mon Sep 17 00:00:00 2001 From: nquidox Date: Fri, 10 Oct 2025 21:17:49 +0300 Subject: [PATCH] action update --- .forgejo/workflows/make-image.yml | 18 +++++++++++++----- cmd/main.go | 4 ++-- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.forgejo/workflows/make-image.yml b/.forgejo/workflows/make-image.yml index 34ada13..e7e5484 100644 --- a/.forgejo/workflows/make-image.yml +++ b/.forgejo/workflows/make-image.yml @@ -11,13 +11,21 @@ jobs: build-and-push: name: Make image runs-on: ubuntu-latest - container: - image: ubuntu-latest - options: --privileged -v /var/run/docker.sock:/var/run/docker.sock + steps: - name: Checkout code uses: actions/checkout@v4 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Login to Forgejo + uses: docker/login-action@v3 + with: + registry: repo.nqws.ru + username: ${{ secrets.MAINTAINER_USERNAME }} + password: ${{ secrets.MAINTAINER_TOKEN }} + - name: Extract version from tag id: extract_version run: | @@ -27,6 +35,6 @@ jobs: - name: Make image run: | docker buildx build --platform linux/amd64 \ - --tag repo.nqws.ru/merch-tracker/mtv2-repo-app:latest \ - --tag repo.nqws.ru/merch-tracker/mtv2-repo-app:${{ env.VERSION }} \ + --tag repo.nqws.ru/${{ github.repository }}:latest \ + --tag repo.nqws.ru/${{ github.repository }}:${{ env.VERSION }} \ --push . diff --git a/cmd/main.go b/cmd/main.go index f16c4e3..462985b 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -27,8 +27,8 @@ import ( func main() { log.Debug("Starting merch-parser-api") //setup config - //c := config.NewConfig() - c := config.DevConfig() + c := config.NewConfig() + //c := config.DevConfig() ctx := context.Background() //log level