From 98f0aaeb6a540f2b06dfc15ec9d25fc23cac0391 Mon Sep 17 00:00:00 2001 From: Aungkokolin1997 Date: Fri, 10 May 2024 15:36:30 +0700 Subject: [PATCH 1/2] [FIX] Dockerfile: update postgresql repo --- Dockerfile | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6249d84..7cd4799 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,12 +4,23 @@ LABEL maintainer="Quartile Limited " ARG ODOO_SOURCE=OCA/OCB ARG ODOO_VERSION=11.0 -RUN apt-get update && apt-get install -y gnupg +# Update and install all necessary packages +# - `ca-certificates`: Required to securely access archived repositories over HTTPS, +# ensuring SSL/TLS certificate verification and preventing access errors. +RUN apt-get update && apt-get install -y \ + wget \ + ca-certificates \ + gnupg \ + && rm -rf /var/lib/apt/lists/* + +# Add the PostgreSQL GPG key +RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 -# Update source repository -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 \ - && echo "deb http://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main" > /etc/apt/sources.list.d/pgdg.list \ - && apt-get update +# Add the PostgreSQL archive repository +RUN echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ bionic-pgdg main" > /etc/apt/sources.list.d/pgdg.list + +# Update package list +RUN apt-get update # Set Environment Variable ENV LC_ALL=C.UTF-8 From 2a1b042fe6f02c54a2c10049861096b67b6133e5 Mon Sep 17 00:00:00 2001 From: Aungkokolin1997 Date: Fri, 10 May 2024 17:21:07 +0700 Subject: [PATCH 2/2] adj --- Dockerfile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7cd4799..5706cd7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,15 +12,11 @@ RUN apt-get update && apt-get install -y \ ca-certificates \ gnupg \ && rm -rf /var/lib/apt/lists/* - -# Add the PostgreSQL GPG key -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 # Add the PostgreSQL archive repository -RUN echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ bionic-pgdg main" > /etc/apt/sources.list.d/pgdg.list - -# Update package list -RUN apt-get update +RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 \ + && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ bionic-pgdg main" > /etc/apt/sources.list.d/pgdg.list \ + && apt-get update # Set Environment Variable ENV LC_ALL=C.UTF-8