From 3dc5f4df166c1f6604b91824faa3d220f0bb4edf Mon Sep 17 00:00:00 2001 From: Jabber Developer Date: Tue, 7 Jul 2026 13:01:37 +0000 Subject: [PATCH] Fix issues, add .dockerignore --- .dockerignore | 35 ++++++++++++++++++++++++++++ .github/workflows/docker-publish.yml | 11 ++++----- ci/Dockerfile | 7 ++++++ 3 files changed, 46 insertions(+), 7 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..07e489ca --- /dev/null +++ b/.dockerignore @@ -0,0 +1,35 @@ +.git +.gitignore +.gitmodules +.kilo +.kilocode +build-* +*.o +*.lo +*.la +*.loT +*.pc +autom4te.cache +config.log +config.status +configure~ +compile +config.guess +config.sub +install-sh +ltmain.sh +Makefile.in +configure.ac +*.am +*.in +test-suite.log +coverage* +prof.supp +debug-log*.log +.cache +meson-* +*.doap +profrc.example +theme_template +docs/ +apidocs/ diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 7a4e2c1c..a7811abb 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -2,7 +2,7 @@ name: Publish Docker image on: push: - branches: [master] + branches: [master, ci/docker-hub-publishing] release: types: [published] @@ -11,7 +11,6 @@ jobs: name: Push Docker image to Docker Hub runs-on: ubuntu-latest permissions: - packages: write contents: read steps: - name: Check out the repo @@ -29,10 +28,10 @@ jobs: with: images: cproofdev/cproof tags: | - type=raw,value=dev,enable-if-ref=refs/heads/master - type=sha,prefix=nightly-,enable-if-ref=refs/heads/master + type=raw,value=dev,enable={{is_default_branch}} + type=sha,prefix=nightly-,enable={{is_default_branch}} type=ref,event=tag - type=raw,value=latest,enable-if-ref=refs/tags/* + type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/') }} - name: Build and push Docker image id: push @@ -43,5 +42,3 @@ jobs: push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - - \ No newline at end of file diff --git a/ci/Dockerfile b/ci/Dockerfile index df910453..a7550de8 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -79,6 +79,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libreadline8t64 \ libnotify4 \ python3 \ + libpython3.14 \ libgpgme45 \ libotr5t64 \ libgtk-3-0t64 \ @@ -94,6 +95,12 @@ COPY --from=builder /usr/local/bin/profanity /usr/local/bin/profanity COPY --from=builder /usr/local/lib/libprofanity* /usr/local/lib/ COPY --from=builder /usr/local/include/profapi.h /usr/local/include/ COPY --from=builder /usr/local/share/profanity /usr/local/share/profanity +COPY --from=builder /usr/lib/libstrophe.so* /usr/lib/ +COPY --from=builder /usr/local/lib/libstrophe.so* /usr/local/lib/ + +RUN ldconfig + +RUN ldd /usr/local/bin/profanity | grep 'not found' && exit 1 || true RUN mkdir -p /root/.config/profanity