From eb851844bce6ed43d0f6f7e68e239ba951f4014c Mon Sep 17 00:00:00 2001 From: Noelle Wang <73260931+No767@users.noreply.github.com> Date: Wed, 7 Feb 2024 15:43:16 -0800 Subject: [PATCH] Remove C build tools and upgrade PostgreSQL to 16 (#72) --- docker/Dockerfile | 5 +---- docker/pg/Dockerfile | 4 ++-- docker/pg/init.sh | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 962daa5..3cb3bdf 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -10,10 +10,7 @@ RUN apt-get update \ tini \ bash \ netcat-traditional \ - libffi-dev \ git \ - gcc \ - libc6-dev \ && apt-get clean WORKDIR /rodhaj @@ -42,4 +39,4 @@ STOPSIGNAL SIGTERM LABEL org.opencontainers.image.title="Rodhaj" LABEL org.opencontainers.image.description="A discord modmail bot" LABEL org.opencontainers.image.licenses="Apache-2.0" -LABEL org.opencontainers.image.source="https://github.com/transprogrammer/rodhaj" \ No newline at end of file +LABEL org.opencontainers.image.source="https://github.com/transprogrammer/rodhaj" diff --git a/docker/pg/Dockerfile b/docker/pg/Dockerfile index d878a0f..1e8744e 100644 --- a/docker/pg/Dockerfile +++ b/docker/pg/Dockerfile @@ -1,2 +1,2 @@ -FROM postgres:15 -COPY /init.sh /docker-entrypoint-initdb.d/ \ No newline at end of file +FROM postgres:16 +COPY /init.sh /docker-entrypoint-initdb.d/ diff --git a/docker/pg/init.sh b/docker/pg/init.sh index 3cc08ac..94f6a61 100644 --- a/docker/pg/init.sh +++ b/docker/pg/init.sh @@ -2,6 +2,6 @@ set -e psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL - CREATE ROLE rodhaj WITH LOGIN PASSWORD "$RODHAJ_PASSWORD"; + CREATE ROLE rodhaj WITH LOGIN PASSWORD '$RODHAJ_PASSWORD'; CREATE DATABASE rodhaj OWNER rodhaj; -EOSQL \ No newline at end of file +EOSQL