From 19e2ad5fcd04a4de038e803f54b482c4d51bf6b6 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Wed, 15 Nov 2023 14:34:17 +0000 Subject: [PATCH 1/5] fix: docker-images/psql/Dockerfile to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-DEBIAN11-GLIBC-5927133 - https://snyk.io/vuln/SNYK-DEBIAN11-GLIBC-5927133 - https://snyk.io/vuln/SNYK-DEBIAN11-GLIBC-5927133 - https://snyk.io/vuln/SNYK-DEBIAN11-GLIBC-5927133 - https://snyk.io/vuln/SNYK-DEBIAN11-NCURSES-5421197 --- docker-images/psql/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-images/psql/Dockerfile b/docker-images/psql/Dockerfile index cc1a927d..47d155d2 100644 --- a/docker-images/psql/Dockerfile +++ b/docker-images/psql/Dockerfile @@ -1,4 +1,4 @@ -FROM postgres:15.2 +FROM postgres:15.5 COPY init-scripts/create-multiple-postgresql-databases.sh /docker-entrypoint-initdb.d/create-multiple-postgresql-databases.sh From da5ee02083fe57793568959cbd8d02ac60dc82ed Mon Sep 17 00:00:00 2001 From: jesperancinha Date: Thu, 18 Jan 2024 14:24:41 +0100 Subject: [PATCH 2/5] Tries without upgrade --- docker-images/psql/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-images/psql/Dockerfile b/docker-images/psql/Dockerfile index 47d155d2..cc291706 100644 --- a/docker-images/psql/Dockerfile +++ b/docker-images/psql/Dockerfile @@ -6,7 +6,7 @@ RUN apt update RUN apt-get install python3-pip python3-dev libpq-dev -y -RUN pip3 install --upgrade pip +#RUN pip3 install --upgrade pip RUN pip install patroni From 95ee072e0479499a3cc7da7ac82a1756382dcc82 Mon Sep 17 00:00:00 2001 From: jesperancinha Date: Thu, 18 Jan 2024 14:30:54 +0100 Subject: [PATCH 3/5] pip3 maybe --- docker-images/psql/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-images/psql/Dockerfile b/docker-images/psql/Dockerfile index cc291706..85a5cd9a 100644 --- a/docker-images/psql/Dockerfile +++ b/docker-images/psql/Dockerfile @@ -8,11 +8,11 @@ RUN apt-get install python3-pip python3-dev libpq-dev -y #RUN pip3 install --upgrade pip -RUN pip install patroni +RUN pip3 install patroni -RUN pip install python-etcd +RUN pip3 install python-etcd -RUN pip install psycopg2 +RUN pip3 install psycopg2 RUN apt update From 391d2651fe71b5ec1b04659852159745c02817ba Mon Sep 17 00:00:00 2001 From: jesperancinha Date: Thu, 18 Jan 2024 14:36:07 +0100 Subject: [PATCH 4/5] python3-full --- docker-images/psql/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-images/psql/Dockerfile b/docker-images/psql/Dockerfile index 85a5cd9a..3f94aca0 100644 --- a/docker-images/psql/Dockerfile +++ b/docker-images/psql/Dockerfile @@ -4,7 +4,7 @@ COPY init-scripts/create-multiple-postgresql-databases.sh /docker-entrypoint-ini RUN apt update -RUN apt-get install python3-pip python3-dev libpq-dev -y +RUN apt-get install python3-pip python3-dev libpq-dev python3-full -y #RUN pip3 install --upgrade pip From 2a9b7a60a21043692e9ccf0da38ec335924379a6 Mon Sep 17 00:00:00 2001 From: jesperancinha Date: Thu, 18 Jan 2024 14:49:35 +0100 Subject: [PATCH 5/5] pip3 --break-system-packages --- docker-images/psql/Dockerfile | 6 +++--- docker-images/psql/Makefile | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 docker-images/psql/Makefile diff --git a/docker-images/psql/Dockerfile b/docker-images/psql/Dockerfile index 3f94aca0..176bd393 100644 --- a/docker-images/psql/Dockerfile +++ b/docker-images/psql/Dockerfile @@ -8,11 +8,11 @@ RUN apt-get install python3-pip python3-dev libpq-dev python3-full -y #RUN pip3 install --upgrade pip -RUN pip3 install patroni +RUN pip3 install patroni --break-system-packages -RUN pip3 install python-etcd +RUN pip3 install python-etcd --break-system-packages -RUN pip3 install psycopg2 +RUN pip3 install psycopg2 --break-system-packages RUN apt update diff --git a/docker-images/psql/Makefile b/docker-images/psql/Makefile new file mode 100644 index 00000000..1a947b71 --- /dev/null +++ b/docker-images/psql/Makefile @@ -0,0 +1,2 @@ +build-docker: + docker build . -t vma-postgres \ No newline at end of file