diff --git a/runtimes/7.4/Dockerfile b/runtimes/7.4/Dockerfile index d852a97e..af632c89 100644 --- a/runtimes/7.4/Dockerfile +++ b/runtimes/7.4/Dockerfile @@ -4,6 +4,7 @@ LABEL maintainer="Taylor Otwell" ARG WWWGROUP ARG NODE_VERSION=16 +ARG POSTGRES_VERSION=14 WORKDIR /var/www/html @@ -34,10 +35,12 @@ RUN apt-get update \ && npm install -g npm \ && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ + && echo "deb http://apt.postgresql.org/pub/repos/apt impish-pgdg main" > /etc/apt/sources.list.d/pgdg.list \ + && curl --silent -o - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ && apt-get update \ && apt-get install -y yarn \ && apt-get install -y mysql-client \ - && apt-get install -y postgresql-client \ + && apt-get install -y postgresql-client-$POSTGRES_VERSION \ && apt-get -y autoremove \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/runtimes/8.0/Dockerfile b/runtimes/8.0/Dockerfile index bafe3286..00063e0e 100644 --- a/runtimes/8.0/Dockerfile +++ b/runtimes/8.0/Dockerfile @@ -4,6 +4,7 @@ LABEL maintainer="Taylor Otwell" ARG WWWGROUP ARG NODE_VERSION=16 +ARG POSTGRES_VERSION=14 WORKDIR /var/www/html @@ -34,6 +35,8 @@ RUN apt-get update \ && npm install -g npm \ && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ + && echo "deb http://apt.postgresql.org/pub/repos/apt impish-pgdg main" > /etc/apt/sources.list.d/pgdg.list \ + && curl --silent -o - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ && apt-get update \ && apt-get install -y yarn \ && apt-get install -y mysql-client \ diff --git a/runtimes/8.1/Dockerfile b/runtimes/8.1/Dockerfile index 167a6d59..d350b5be 100644 --- a/runtimes/8.1/Dockerfile +++ b/runtimes/8.1/Dockerfile @@ -4,6 +4,7 @@ LABEL maintainer="Taylor Otwell" ARG WWWGROUP ARG NODE_VERSION=16 +ARG POSTGRES_VERSION=14 WORKDIR /var/www/html @@ -35,6 +36,8 @@ RUN apt-get update \ && npm install -g npm \ && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ + && echo "deb http://apt.postgresql.org/pub/repos/apt impish-pgdg main" > /etc/apt/sources.list.d/pgdg.list \ + && curl --silent -o - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ && apt-get update \ && apt-get install -y yarn \ && apt-get install -y mysql-client \ diff --git a/stubs/pgsql.stub b/stubs/pgsql.stub index 4d80895c..5aeced5f 100644 --- a/stubs/pgsql.stub +++ b/stubs/pgsql.stub @@ -1,5 +1,5 @@ pgsql: - image: 'postgres:13' + image: 'postgres:14' ports: - '${FORWARD_DB_PORT:-5432}:5432' environment: