Merge pull request #24 from cybertec-postgresql/22-bump-ubuntu-to-220…

…4-in-docker-images

[+] update Ubuntu to 22.04 in Docker files, closes #22

.github/workflows/build.yml

@@ -156,3 +156,23 @@ jobs:
     #   with:
     #     version: latest
     #     args: release --snapshot --skip-publish --rm-dist
+
+  test-docker-images:
+    if: true # false to skip job during debug
+    name: Test Docker Image on Ubuntu
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Check out code
+      uses: actions/checkout@v3
+
+    - name: Build Docker Image
+      shell: bash
+      run: |
+        ./build-docker.sh 
+
+    # - name: Smoke Test Docker Image
+    #   timeout-minutes: 10
+    #   shell: bash
+    #   run: |        
+    #     docker/test/smoke_test_docker_image.sh cybertec/pgwatch3:latest     

docker/Dockerfile

@@ -10,11 +10,11 @@ ADD src /pgwatch3
 RUN cd /pgwatch3 && bash build_gatherer.sh
 
 
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 RUN apt-get -q update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -qy curl ca-certificates gnupg \
-    && echo "deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
+    && echo "deb http://apt.postgresql.org/pub/repos/apt/ jammy-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
     && curl -s https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && apt-get -q update \
     && DEBIAN_FRONTEND=noninteractive apt-get -qy install postgresql-14 \
        postgresql-plpython3-14 libfontconfig python3-pip libssl-dev libpq-dev \

docker/Dockerfile-daemon

@@ -10,7 +10,7 @@ ADD src /pgwatch3
 RUN cd /pgwatch3 && bash build_gatherer.sh
 
 
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 RUN apt-get -q update && apt-get -qy install wget git && apt autoremove -y && mkdir /pgwatch3
 

docker/Dockerfile-webui

@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 RUN apt-get -q update && apt-get -qy install python3-pip \
     && mkdir /pgwatch3