From 708738560174dadfd5ae7874bbea38570206ea2e Mon Sep 17 00:00:00 2001 From: "David E. Wheeler" Date: Mon, 22 Jan 2024 11:25:23 -0500 Subject: [PATCH] Try disabling check --- .github/workflows/cicd.yml | 36 +++++++++++++++++++----------------- Dockerfile | 4 +++- bin/entrypoint.sh | 4 ---- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index 76b6f33..fb44b53 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -8,6 +8,7 @@ jobs: test: name: 🐘 PostgreSQL ${{ matrix.pg }} runs-on: ubuntu-latest + if: startsWith(github.ref, 'refs/tags/v') strategy: matrix: pg: [16, 15, 14, 13, 12, 11, 10, 9.6, 9.5, 9.4, 9.3, 9.2, 9.1, '9.0', 8.4, 8.3, 8.2] @@ -33,25 +34,25 @@ jobs: publish: # Publish for a tag starting with v. name: Push to Docker Hub - needs: test - if: startsWith(github.ref, 'refs/tags/v') + # needs: test + # if: startsWith(github.ref, 'refs/tags/v') runs-on: ubuntu-latest steps: - name: Check out the repo uses: actions/checkout@v4 - - name: Docker meta - id: meta - uses: docker/metadata-action@v5 - with: - images: pgxn/pgxn-tools - tags: | - type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} - type=semver,pattern=v{{major}} - type=raw,value=bookworm - labels: | - org.opencontainers.image.title=PGXN Tools - org.opencontainers.image.licenses=PostgreSQL + # - name: Docker meta + # id: meta + # uses: docker/metadata-action@v5 + # with: + # images: pgxn/pgxn-tools + # tags: | + # type=semver,pattern={{version}} + # type=semver,pattern={{major}}.{{minor}} + # type=semver,pattern=v{{major}} + # type=raw,value=bookworm + # labels: | + # org.opencontainers.image.title=PGXN Tools + # org.opencontainers.image.licenses=PostgreSQL - name: Login to DockerHub uses: docker/login-action@v3 with: @@ -62,5 +63,6 @@ jobs: uses: docker/build-push-action@v5 with: push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} + # tags: ${{ steps.meta.outputs.tags }} + # labels: ${{ steps.meta.outputs.labels }} + tags: _testing_do_not_use diff --git a/Dockerfile b/Dockerfile index d4a7248..7438680 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,9 @@ RUN chmod +x /usr/local/bin/apt.postgresql.org.sh \ && rm -r cpanm ~/.cpanm \ && echo Defaults lecture = never >> /etc/sudoers \ && perl -i -pe 's/\bALL$/NOPASSWD:ALL/g' /etc/sudoers \ - && echo 'postgres ALL=(ALL:ALL) NOPASSWD:ALL' >> /etc/sudoers + && echo 'postgres ALL=(ALL:ALL) NOPASSWD:ALL' >> /etc/sudoers \ + # Ensure Git can do stuff in the working directory (issue #5). + && git config --system --add safe.directory '*' COPY bin/* /usr/local/bin/ diff --git a/bin/entrypoint.sh b/bin/entrypoint.sh index ff43b81..005cd31 100755 --- a/bin/entrypoint.sh +++ b/bin/entrypoint.sh @@ -2,10 +2,6 @@ set -e -# Ensure Git can do stuff in the working directory. -# https://github.com/pgxn/docker-pgxn-tools/issues/5 -git config --system --add safe.directory "$PWD" - # Just continue if unprivileged user not requested. [ -z "$AS_USER" ] && exec "$@"