From a3973b7a35e3f576fa39bfb56d103d7c18bccb7b Mon Sep 17 00:00:00 2001 From: James Kent Date: Fri, 24 May 2024 12:21:02 -0500 Subject: [PATCH] remove unnecessary functions --- store/docker-compose.yml | 1 - store/postgres/Dockerfile | 8 -------- store/postgres/custom-entrypoint.sh | 22 ---------------------- 3 files changed, 31 deletions(-) delete mode 100644 store/postgres/custom-entrypoint.sh diff --git a/store/docker-compose.yml b/store/docker-compose.yml index 6ef10bc7..13bcd421 100644 --- a/store/docker-compose.yml +++ b/store/docker-compose.yml @@ -49,7 +49,6 @@ services: - '5432' env_file: - .env - entrypoint: ["/usr/local/bin/custom-entrypoint.sh"] volumes: postgres_data: diff --git a/store/postgres/Dockerfile b/store/postgres/Dockerfile index 4ff63dd1..3c03f6b3 100644 --- a/store/postgres/Dockerfile +++ b/store/postgres/Dockerfile @@ -20,10 +20,6 @@ RUN curl -L https://github.com/pgvector/pgvector/archive/refs/tags/v0.7.0.tar.gz # Copy initialization script COPY init-vector-extension.sql /docker-entrypoint-initdb.d/ -# Copy custom entrypoint script -COPY custom-entrypoint.sh /usr/local/bin/ -RUN chmod +x /usr/local/bin/custom-entrypoint.sh - # Copy scripts and set permissions COPY pg_dump-to-s3 /home RUN chmod +x /home/pg_dump-to-s3.sh /home/s3-autodelete.sh @@ -35,7 +31,3 @@ RUN service cron start # Convert scripts to Unix format RUN dos2unix /home/pg_dump-to-s3.sh RUN dos2unix /home/s3-autodelete.sh - -# Set the entrypoint to the custom script -ENTRYPOINT ["custom-entrypoint.sh"] -CMD ["postgres"] diff --git a/store/postgres/custom-entrypoint.sh b/store/postgres/custom-entrypoint.sh deleted file mode 100644 index 9675d90f..00000000 --- a/store/postgres/custom-entrypoint.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -set -e - -# Start PostgreSQL and wait for it to be ready -/usr/local/bin/docker-entrypoint.sh postgres & - -# Wait for PostgreSQL to start -until pg_isready -p 5432 -U "$POSTGRES_USER"; do - echo "$(date) - waiting for database to start" - sleep 2 -done - -sleep 1 - -echo "STARTING EXTENSION" -# Enable the pgvector extension -psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL - CREATE EXTENSION IF NOT EXISTS vector; -EOSQL - -# Wait for PostgreSQL process to keep the container running -wait