From ebb36919f473e37ee575de150a0d3e3398d5ba60 Mon Sep 17 00:00:00 2001 From: Morre Date: Sun, 8 Jan 2023 12:45:13 +0100 Subject: [PATCH] fix: debug log to stdout parameter This changed in smbd 4.15 and was discussed in https://github.com/dperson/samba/pull/405. --- .github/workflows/publish-image.yml | 14 +++++++++++--- samba.sh | 4 ++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish-image.yml b/.github/workflows/publish-image.yml index c1e4f4b..0d400d5 100644 --- a/.github/workflows/publish-image.yml +++ b/.github/workflows/publish-image.yml @@ -2,8 +2,6 @@ name: Publish OCI image on: push: - branches: - - main jobs: push_to_registry: @@ -13,7 +11,17 @@ jobs: - name: Check out the repo uses: actions/checkout@v3.3.0 + - name: Check if we need to login and if image should be pushed + id: push_check + run: | + if [[ "${{ github.ref }}" == refs/heads/main ]]; then + echo "push=true" >> $GITHUB_OUTPUT + else + echo "push=false" >> $GITHUB_OUTPUT + fi + - name: Log in to the Container registry + if: ${{ steps.push_check.outputs.push }} uses: docker/login-action@v2.1.0 with: registry: ghcr.io @@ -24,5 +32,5 @@ jobs: uses: docker/build-push-action@v3.2.0 with: context: . - push: true + push: ${{ steps.push_check.outputs.push }} tags: "ghcr.io/${{ github.repository }}:latest" diff --git a/samba.sh b/samba.sh index ebb4e20..f66001d 100755 --- a/samba.sh +++ b/samba.sh @@ -293,5 +293,5 @@ elif ps -ef | egrep -v grep | grep -q smbd; then echo "Service already running, please restart container to apply changes" else [[ ${NMBD:-""} ]] && ionice -c 3 nmbd -D - exec ionice -c 3 smbd -FS --no-process-group