From 768b394f33693f9c39c47ea8a90bb5ebc0d28709 Mon Sep 17 00:00:00 2001 From: Tvion Date: Fri, 5 Dec 2025 13:33:59 +0500 Subject: [PATCH] fix: linter errors --- .github/workflows/build-backup-daemon.yaml | 6 +++--- .github/workflows/build-dbaas-adapter.yaml | 4 ++-- .github/workflows/build-patroni.yaml | 6 +++--- .github/workflows/build-pgbackrest-sidecar.yaml | 6 +++--- .github/workflows/build-query-exporter.yaml | 4 ++-- .github/workflows/build-replication-controller.yaml | 12 ++++++------ .github/workflows/build-upgrade.yaml | 4 ++-- .github/workflows/clean-backup-daemon.yaml | 4 ++-- .github/workflows/clean-dbaas-adapter.yaml | 4 ++-- .github/workflows/clean-monitoring-agent.yaml | 6 +++--- .github/workflows/clean-pgbackrest-sidecar.yaml | 4 ++-- .github/workflows/clean-query-exporter.yaml | 4 ++-- .github/workflows/clean-replication-controller.yaml | 8 ++++---- .github/workflows/clean-upgrade.yaml | 4 ++-- services/backup-daemon/Dockerfile | 4 +++- services/patroni/Dockerfile | 4 ++-- 16 files changed, 43 insertions(+), 41 deletions(-) diff --git a/.github/workflows/build-backup-daemon.yaml b/.github/workflows/build-backup-daemon.yaml index 70643a77..77e766ba 100644 --- a/.github/workflows/build-backup-daemon.yaml +++ b/.github/workflows/build-backup-daemon.yaml @@ -44,14 +44,14 @@ jobs: password: ${{secrets.GITHUB_TOKEN}} - name: Prepare Tag run: echo "TAG_NAME=$(echo ${TAG_NAME} | sed 's@refs/tags/@@;s@refs/heads/@@;s@/@_@g')" >> $GITHUB_ENV - - name: Get package IDs for delete + - name: Get package IDs for delete id: get-ids-for-delete uses: Netcracker/get-package-ids@v0.0.1 with: component-name: ${{ matrix.component.name }} component-tag: ${{ env.TAG_NAME }} access-token: ${{secrets.GITHUB_TOKEN}} - if: ${{ env.PUSH }} + if: ${{ env.PUSH }} - name: Build and push uses: docker/build-push-action@v6 with: @@ -63,7 +63,7 @@ jobs: tags: ghcr.io/netcracker/${{ matrix.component.name }}:${{ env.TAG_NAME }} provenance: false - uses: actions/delete-package-versions@v5 - with: + with: package-name: ${{ matrix.component.name }} package-type: 'container' package-version-ids: ${{ steps.get-ids-for-delete.outputs.ids-for-delete }} diff --git a/.github/workflows/build-dbaas-adapter.yaml b/.github/workflows/build-dbaas-adapter.yaml index b7d2e3fc..ffb2d741 100644 --- a/.github/workflows/build-dbaas-adapter.yaml +++ b/.github/workflows/build-dbaas-adapter.yaml @@ -71,7 +71,7 @@ jobs: password: ${{secrets.GITHUB_TOKEN}} - name: Prepare Tag run: echo "TAG_NAME=$(echo ${TAG_NAME} | sed 's@refs/tags/@@;s@refs/heads/@@;s@/@_@g')" >> $GITHUB_ENV - - name: Get package IDs for delete + - name: Get package IDs for delete id: get-ids-for-delete uses: Netcracker/get-package-ids@v0.0.1 with: @@ -90,7 +90,7 @@ jobs: tags: ghcr.io/netcracker/${{ matrix.component.name }}:${{ env.TAG_NAME }} provenance: false - uses: actions/delete-package-versions@v5 - with: + with: package-name: ${{ matrix.component.name }} package-type: 'container' package-version-ids: ${{ steps.get-ids-for-delete.outputs.ids-for-delete }} diff --git a/.github/workflows/build-patroni.yaml b/.github/workflows/build-patroni.yaml index df400158..158abedc 100644 --- a/.github/workflows/build-patroni.yaml +++ b/.github/workflows/build-patroni.yaml @@ -59,13 +59,13 @@ jobs: password: ${{secrets.GITHUB_TOKEN}} - name: Prepare Tag run: echo "TAG_NAME=$(echo ${TAG_NAME} | sed 's@refs/tags/@@;s@refs/heads/@@;s@/@_@g')" >> $GITHUB_ENV - - name: Get package IDs for delete + - name: Get package IDs for delete id: get-ids-for-delete uses: Netcracker/get-package-ids@v0.0.1 with: component-name: ${{ matrix.component.name }} component-tag: ${{ env.TAG_NAME }} - access-token: ${{secrets.GITHUB_TOKEN}} + access-token: ${{secrets.GITHUB_TOKEN}} if: ${{ env.PUSH }} - name: Build and push uses: docker/build-push-action@v6 @@ -79,7 +79,7 @@ jobs: tags: ghcr.io/netcracker/${{ matrix.component.name }}:${{ env.TAG_NAME }} provenance: false - uses: actions/delete-package-versions@v5 - with: + with: package-name: ${{ matrix.component.name }} package-type: 'container' package-version-ids: ${{ steps.get-ids-for-delete.outputs.ids-for-delete }} diff --git a/.github/workflows/build-pgbackrest-sidecar.yaml b/.github/workflows/build-pgbackrest-sidecar.yaml index 581e526f..6b6aa13f 100644 --- a/.github/workflows/build-pgbackrest-sidecar.yaml +++ b/.github/workflows/build-pgbackrest-sidecar.yaml @@ -50,14 +50,14 @@ jobs: password: ${{secrets.GITHUB_TOKEN}} - name: Prepare Tag run: echo "TAG_NAME=$(echo ${TAG_NAME} | sed 's@refs/tags/@@;s@refs/heads/@@;s@/@_@g')" >> $GITHUB_ENV - - name: Get package IDs for delete + - name: Get package IDs for delete id: get-ids-for-delete uses: Netcracker/get-package-ids@v0.0.1 with: component-name: ${{ matrix.component.name }} component-tag: ${{ env.TAG_NAME }} access-token: ${{secrets.GITHUB_TOKEN}} - if: ${{ env.PUSH }} + if: ${{ env.PUSH }} - name: Build and push uses: docker/build-push-action@v6 with: @@ -69,7 +69,7 @@ jobs: tags: ghcr.io/netcracker/${{ matrix.component.name }}:${{ env.TAG_NAME }} provenance: false - uses: actions/delete-package-versions@v5 - with: + with: package-name: ${{ matrix.component.name }} package-type: 'container' package-version-ids: ${{ steps.get-ids-for-delete.outputs.ids-for-delete }} diff --git a/.github/workflows/build-query-exporter.yaml b/.github/workflows/build-query-exporter.yaml index e7592059..bb18e896 100644 --- a/.github/workflows/build-query-exporter.yaml +++ b/.github/workflows/build-query-exporter.yaml @@ -50,7 +50,7 @@ jobs: password: ${{secrets.GITHUB_TOKEN}} - name: Prepare Tag run: echo "TAG_NAME=$(echo ${TAG_NAME} | sed 's@refs/tags/@@;s@refs/heads/@@;s@/@_@g')" >> $GITHUB_ENV - - name: Get package IDs for delete + - name: Get package IDs for delete id: get-ids-for-delete uses: Netcracker/get-package-ids@v0.0.1 with: @@ -69,7 +69,7 @@ jobs: tags: ghcr.io/netcracker/${{ matrix.component.name }}:${{ env.TAG_NAME }} provenance: false - uses: actions/delete-package-versions@v5 - with: + with: package-name: ${{ matrix.component.name }} package-type: 'container' package-version-ids: ${{ steps.get-ids-for-delete.outputs.ids-for-delete }} diff --git a/.github/workflows/build-replication-controller.yaml b/.github/workflows/build-replication-controller.yaml index 4c4a1d7d..d4367839 100644 --- a/.github/workflows/build-replication-controller.yaml +++ b/.github/workflows/build-replication-controller.yaml @@ -45,14 +45,14 @@ jobs: password: ${{secrets.GITHUB_TOKEN}} - name: Prepare Tag run: echo "TAG_NAME=$(echo ${TAG_NAME} | sed 's@refs/tags/@@;s@refs/heads/@@;s@/@_@g')" >> $GITHUB_ENV - - name: Get package IDs for delete + - name: Get package IDs for delete id: get-ids-for-delete uses: Netcracker/get-package-ids@v0.0.1 with: component-name: ${{ matrix.component.name }} component-tag: ${{ env.TAG_NAME }} - access-token: ${{ secrets.GH_ACCESS_TOKEN }} - if: ${{ env.PUSH }} + access-token: ${{ secrets.GH_ACCESS_TOKEN }} + if: ${{ env.PUSH }} - name: Build and push uses: docker/build-push-action@v6 with: @@ -60,12 +60,12 @@ jobs: context: ${{ matrix.component.context }} file: ${{ matrix.component.file }} platforms: linux/amd64,linux/arm64 - push: ${{ env.PUSH }} + push: ${{ env.PUSH }} tags: ghcr.io/netcracker/${{ matrix.component.name }}:${{ env.TAG_NAME }} provenance: false - uses: actions/delete-package-versions@v5 - with: + with: package-name: ${{ matrix.component.name }} package-type: 'container' package-version-ids: ${{ steps.get-ids-for-delete.outputs.ids-for-delete }} - if: ${{ steps.get-ids-for-delete.outputs.ids-for-delete }} \ No newline at end of file + if: ${{ steps.get-ids-for-delete.outputs.ids-for-delete }} diff --git a/.github/workflows/build-upgrade.yaml b/.github/workflows/build-upgrade.yaml index d0e0d75f..68f8b6b0 100644 --- a/.github/workflows/build-upgrade.yaml +++ b/.github/workflows/build-upgrade.yaml @@ -44,7 +44,7 @@ jobs: password: ${{secrets.GITHUB_TOKEN}} - name: Prepare Tag run: echo "TAG_NAME=$(echo ${TAG_NAME} | sed 's@refs/tags/@@;s@refs/heads/@@;s@/@_@g')" >> $GITHUB_ENV - - name: Get package IDs for delete + - name: Get package IDs for delete id: get-ids-for-delete uses: Netcracker/get-package-ids@v0.0.1 with: @@ -63,7 +63,7 @@ jobs: tags: ghcr.io/netcracker/${{ matrix.component.name }}:${{ env.TAG_NAME }} provenance: false - uses: actions/delete-package-versions@v5 - with: + with: package-name: ${{ matrix.component.name }} package-type: 'container' package-version-ids: ${{ steps.get-ids-for-delete.outputs.ids-for-delete }} diff --git a/.github/workflows/clean-backup-daemon.yaml b/.github/workflows/clean-backup-daemon.yaml index 3ab0c069..b1cbdfac 100644 --- a/.github/workflows/clean-backup-daemon.yaml +++ b/.github/workflows/clean-backup-daemon.yaml @@ -20,7 +20,7 @@ jobs: registry: ghcr.io username: ${GITHUB_ACTOR} password: ${{secrets.GITHUB_TOKEN}} - - name: Get package IDs for delete + - name: Get package IDs for delete id: get-ids-for-delete uses: Netcracker/get-package-ids@v0.0.1 with: @@ -28,7 +28,7 @@ jobs: component-tag: ${{ env.TAG_NAME }} access-token: ${{ secrets.GITHUB_TOKEN }} - uses: actions/delete-package-versions@v5 - with: + with: package-name: ${{ env.COMPONENT_NAME }} package-type: 'container' package-version-ids: ${{ steps.get-ids-for-delete.outputs.ids-for-delete }} diff --git a/.github/workflows/clean-dbaas-adapter.yaml b/.github/workflows/clean-dbaas-adapter.yaml index 015095e5..8a085105 100644 --- a/.github/workflows/clean-dbaas-adapter.yaml +++ b/.github/workflows/clean-dbaas-adapter.yaml @@ -18,7 +18,7 @@ jobs: registry: ghcr.io username: ${GITHUB_ACTOR} password: ${{secrets.GITHUB_TOKEN}} - - name: Get package IDs for delete + - name: Get package IDs for delete id: get-ids-for-delete uses: Netcracker/get-package-ids@v0.0.1 with: @@ -26,7 +26,7 @@ jobs: component-tag: ${{ env.TAG_NAME }} access-token: ${{secrets.GITHUB_TOKEN}} - uses: actions/delete-package-versions@v5 - with: + with: package-name: ${{ env.COMPONENT_NAME }} package-type: 'container' package-version-ids: ${{ steps.get-ids-for-delete.outputs.ids-for-delete }} diff --git a/.github/workflows/clean-monitoring-agent.yaml b/.github/workflows/clean-monitoring-agent.yaml index 169bf6a1..b734facf 100644 --- a/.github/workflows/clean-monitoring-agent.yaml +++ b/.github/workflows/clean-monitoring-agent.yaml @@ -18,7 +18,7 @@ jobs: registry: ghcr.io username: ${GITHUB_ACTOR} password: ${{secrets.GITHUB_TOKEN}} - - name: Get package IDs for delete + - name: Get package IDs for delete id: get-ids-for-delete uses: Netcracker/get-package-ids@v0.0.1 with: @@ -26,8 +26,8 @@ jobs: component-tag: ${{ env.TAG_NAME }} access-token: ${{secrets.GITHUB_TOKEN}} - uses: actions/delete-package-versions@v5 - with: + with: package-name: ${{ env.COMPONENT_NAME }} package-type: 'container' package-version-ids: ${{ steps.get-ids-for-delete.outputs.ids-for-delete }} - if: ${{ steps.get-ids-for-delete.outputs.ids-for-delete != '' }} \ No newline at end of file + if: ${{ steps.get-ids-for-delete.outputs.ids-for-delete != '' }} diff --git a/.github/workflows/clean-pgbackrest-sidecar.yaml b/.github/workflows/clean-pgbackrest-sidecar.yaml index 7749da20..fecfd37d 100644 --- a/.github/workflows/clean-pgbackrest-sidecar.yaml +++ b/.github/workflows/clean-pgbackrest-sidecar.yaml @@ -18,7 +18,7 @@ jobs: registry: ghcr.io username: ${GITHUB_ACTOR} password: ${{secrets.GITHUB_TOKEN}} - - name: Get package IDs for delete + - name: Get package IDs for delete id: get-ids-for-delete uses: Netcracker/get-package-ids@v0.0.1 with: @@ -26,7 +26,7 @@ jobs: component-tag: ${{ env.TAG_NAME }} access-token: ${{secrets.GITHUB_TOKEN}} - uses: actions/delete-package-versions@v5 - with: + with: package-name: ${{ env.COMPONENT_NAME }} package-type: 'container' package-version-ids: ${{ steps.get-ids-for-delete.outputs.ids-for-delete }} diff --git a/.github/workflows/clean-query-exporter.yaml b/.github/workflows/clean-query-exporter.yaml index 7f8cb692..3423fefc 100644 --- a/.github/workflows/clean-query-exporter.yaml +++ b/.github/workflows/clean-query-exporter.yaml @@ -18,7 +18,7 @@ jobs: registry: ghcr.io username: ${GITHUB_ACTOR} password: ${{secrets.GITHUB_TOKEN}} - - name: Get package IDs for delete + - name: Get package IDs for delete id: get-ids-for-delete uses: Netcracker/get-package-ids@v0.0.1 with: @@ -26,7 +26,7 @@ jobs: component-tag: ${{ env.TAG_NAME }} access-token: ${{secrets.GITHUB_TOKEN}} - uses: actions/delete-package-versions@v5 - with: + with: package-name: ${{ env.COMPONENT_NAME }} package-type: 'container' package-version-ids: ${{ steps.get-ids-for-delete.outputs.ids-for-delete }} diff --git a/.github/workflows/clean-replication-controller.yaml b/.github/workflows/clean-replication-controller.yaml index b21400dc..44642baa 100644 --- a/.github/workflows/clean-replication-controller.yaml +++ b/.github/workflows/clean-replication-controller.yaml @@ -21,16 +21,16 @@ jobs: registry: ghcr.io username: ${GITHUB_ACTOR} password: ${{secrets.GITHUB_TOKEN}} - - name: Get package IDs for delete + - name: Get package IDs for delete id: get-ids-for-delete uses: Netcracker/get-package-ids@v0.0.1 with: component-name: ${{ env.COMPONENT_NAME }} component-tag: ${{ env.TAG_NAME }} - access-token: ${{ secrets.GITHUB_TOKEN }} + access-token: ${{ secrets.GITHUB_TOKEN }} - uses: actions/delete-package-versions@v5 - with: + with: package-name: ${{ env.COMPONENT_NAME }} package-type: 'container' package-version-ids: ${{ steps.get-ids-for-delete.outputs.ids-for-delete }} - if: ${{ steps.get-ids-for-delete.outputs.ids-for-delete }} \ No newline at end of file + if: ${{ steps.get-ids-for-delete.outputs.ids-for-delete }} diff --git a/.github/workflows/clean-upgrade.yaml b/.github/workflows/clean-upgrade.yaml index cd3f9fb4..1c905ba7 100644 --- a/.github/workflows/clean-upgrade.yaml +++ b/.github/workflows/clean-upgrade.yaml @@ -20,7 +20,7 @@ jobs: registry: ghcr.io username: ${GITHUB_ACTOR} password: ${{secrets.GITHUB_TOKEN}} - - name: Get package IDs for delete + - name: Get package IDs for delete id: get-ids-for-delete uses: Netcracker/get-package-ids@v0.0.1 with: @@ -28,7 +28,7 @@ jobs: component-tag: ${{ env.TAG_NAME }} access-token: ${{secrets.GITHUB_TOKEN}} - uses: actions/delete-package-versions@v5 - with: + with: package-name: ${{ env.COMPONENT_NAME }} package-type: 'container' package-version-ids: ${{ steps.get-ids-for-delete.outputs.ids-for-delete }} diff --git a/services/backup-daemon/Dockerfile b/services/backup-daemon/Dockerfile index 19d24d7c..2855e632 100644 --- a/services/backup-daemon/Dockerfile +++ b/services/backup-daemon/Dockerfile @@ -90,4 +90,6 @@ VOLUME /tmp EXPOSE 8080 8081 8082 9000 -CMD ["bash", "/opt/backup/start_backup_daemon.sh"] \ No newline at end of file +CMD ["bash", "/opt/backup/start_backup_daemon.sh"] + +USER 1001 \ No newline at end of file diff --git a/services/patroni/Dockerfile b/services/patroni/Dockerfile index da487684..0afd6f93 100644 --- a/services/patroni/Dockerfile +++ b/services/patroni/Dockerfile @@ -25,10 +25,10 @@ ENV POD_IDENTITY="node1" \ # we craft a custom build of protobuf-c and publish it at this repo. # Remove this line after moving to the next CentOS releases. COPY scripts/archive_wal.sh /opt/scripts/archive_wal.sh -ADD ./scripts/pip.conf /root/.pip/pip.conf +COPY ./scripts/pip.conf /root/.pip/pip.conf COPY ./scripts/postgresql.conf /tmp/postgresql.conf COPY ./scripts/fix_permission.sh /usr/libexec/fix-permissions -ADD ./scripts/* / +COPY ./scripts/* / RUN echo "deb [trusted=yes] http://apt.postgresql.org/pub/repos/apt jammy-pgdg main" >> /etc/apt/sources.list.d/pgdg.list RUN ls -la /etc/apt/