Skip to content

Commit 6920e76

Browse files
authored
update postgres and debian architecture (#655)
1 parent ef856e6 commit 6920e76

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ARG MERGE_COMMIT_SHA
1111

1212

1313
# Build the backend
14-
FROM python:3.9-slim as backend-build
14+
FROM python:3.9-slim-bookworm as backend-build
1515

1616
# Prevents Python from writing pyc files.
1717
ENV PYTHONDONTWRITEBYTECODE=1
@@ -28,7 +28,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2828
&& /opt/venv/bin/pip install -r requirements.txt
2929

3030
# Final image
31-
FROM python:3.9-slim
31+
FROM python:3.9-slim-bookworm
3232

3333
ARG BUILD_DATE
3434
ARG MERGE_COMMIT_SHA

Dockerfile.prebuilt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.9-slim as oss-base
1+
FROM python:3.9-slim-bookworm as oss-base
22

33
# Install necessary packages for building the backend
44
RUN apt-get update && apt-get install -y --no-install-recommends \

database-docker/Dockerfile

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
1-
FROM debian:buster
1+
FROM debian:bookworm
22
ENV DEBIAN_FRONTEND noninteractive
33
RUN apt-get update
4-
RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main" > /etc/apt/sources.list.d/pgdg.list
4+
RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ bookworm-pgdg main" > /etc/apt/sources.list.d/pgdg.list
55
RUN apt-get -y install gnupg
66
RUN apt-get -y install curl
77
RUN apt-get -y install wget
88
RUN curl -sSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
99
RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
1010
RUN apt-get update
11-
RUN apt-get -y install postgresql-14
12-
RUN curl -fsSL -o /usr/local/bin/dbmate https://github.com/amacneil/dbmate/releases/download/v1.16.0/dbmate-linux-amd64
13-
RUN chmod +x /usr/local/bin/dbmate
11+
RUN apt-get -y install postgresql-15
12+
13+
RUN ARCH=$(dpkg --print-architecture) && \
14+
curl -fsSL -o /usr/local/bin/dbmate https://github.com/amacneil/dbmate/releases/download/v1.16.0/dbmate-linux-${ARCH} && \
15+
chmod +x /usr/local/bin/dbmate
16+
1417
WORKDIR /
1518
RUN mkdir ./db
1619
COPY ./db/ ./db/
17-
ENV PATH /usr/lib/postgresql/14/bin:$PATH
20+
ENV PATH /usr/lib/postgresql/15/bin:$PATH
1821
ADD ./dbwait.sh /bin
1922
RUN chmod +x /bin/dbwait.sh

0 commit comments

Comments
 (0)