Merge pull request #1650 from dmitry-sinina/new_pg_images

new postgresql image

.github/workflows/images.yml

@@ -53,30 +53,6 @@ jobs:
           push: true
           tags: ghcr.io/${{ github.repository_owner }}/yeti-web/build-image:bookworm
 
-  postgres-13-build-image:
-    name: Build Postgresql 13 images for CI
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-      contents: read
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Push db image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ci/pg13.Dockerfile
-          push: true
-          tags: ghcr.io/${{ github.repository_owner }}/yeti-web/pgsql:13
-
   postgres-16-build-image:
     name: Build Postgresql 16 images for CI
     runs-on: ubuntu-latest

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
     container: ghcr.io/yeti-switch/yeti-web/build-image:bullseye
     services:
       db:
-        image: ghcr.io/yeti-switch/yeti-web/pgsql:13
+        image: ghcr.io/yeti-switch/yeti-web/pgsql:16
 
     steps:
       - uses: actions/checkout@v4

ci/pg16.Dockerfile

@@ -8,10 +8,10 @@ RUN	apt-get update && \
 	apt-get -y dist-upgrade && \
 	apt-get -y --no-install-recommends install curl gnupg ca-certificates
 
-RUN	curl https://pkg.yeti-switch.org/key.gpg | apt-key add - && \
-	curl https://www.postgresql.org/media/keys/ACCC4CF8.asc	| apt-key add - && \
-	echo "deb http://pkg.yeti-switch.org/debian/bookworm 1.12 main" >> /etc/apt/sources.list && \
-	echo "deb http://apt.postgresql.org/pub/repos/apt/ bookworm-pgdg main" >> /etc/apt/sources.list
+RUN	wget https://deb.yeti-switch.org/debian/yeti.gpg -O /etc/apt/trusted.gpg.d/yeti-key.asc && \
+	wget https://www.postgresql.org/media/keys/ACCC4CF8.asc -O /etc/apt/trusted.gpg.d/pgdg-key.asc && \
+	echo "deb https://deb.yeti-switch.org/debian/1.13 bookworm main" >> /etc/apt/sources.list && \
+	echo "deb https://apt.postgresql.org/pub/repos/apt/ bookworm-pgdg main" >> /etc/apt/sources.list
 
 RUN 	apt-get update && \
 	apt-get -y --no-install-recommends install \