diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml index 96c570e12..6c52b93c3 100644 --- a/docker-compose-ci.yml +++ b/docker-compose-ci.yml @@ -28,9 +28,7 @@ services: postgres: restart: on-failure - build: - context: ./postgres - dockerfile: postgres.Dockerfile + image: pgvector/pgvector:pg16 ports: - "5432:5432" environment: diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 0733600fc..9db3287c3 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -21,9 +21,7 @@ services: postgres: restart: on-failure - build: - context: ./postgres - dockerfile: postgres.Dockerfile + image: pgvector/pgvector:pg16 environment: - POSTGRES_USER=${POSTGRES_USER:-postgres} - POSTGRES_DB=${POSTGRES_DB:-postgres} diff --git a/docker-compose.yml b/docker-compose.yml index 5fb8d0017..da19dda09 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,9 +26,7 @@ services: postgres: restart: on-failure - build: - context: ./postgres - dockerfile: postgres.Dockerfile + image: pgvector/pgvector:pg16 environment: - POSTGRES_USER=${POSTGRES_USER:-postgres} - POSTGRES_DB=${POSTGRES_DB:-postgres} diff --git a/docker/postgres.Dockerfile b/docker/postgres.Dockerfile deleted file mode 100644 index af5046fe7..000000000 --- a/docker/postgres.Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -FROM postgres:latest - -# Install dependencies required for pgjwt and locales -RUN apt-get update && \ - apt-get install --fix-missing -y \ - build-essential \ - postgresql-server-dev-all \ - git \ - locales && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# Setup locale -RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \ - locale-gen en_US.UTF-8 && \ - update-locale LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 - -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en -ENV LC_ALL en_US.UTF-8 - -# Clone and build pgjwt -RUN rm -rf pgjwt && \ - git clone https://github.com/michelp/pgjwt.git && \ - cd pgjwt && \ - make && \ - make install diff --git a/postgres/postgres.Dockerfile b/postgres/postgres.Dockerfile deleted file mode 100644 index 27dc44956..000000000 --- a/postgres/postgres.Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# This is installing the pgvector extension for postgres -FROM postgres:latest - -RUN apt-get update && apt-get install -y \ - build-essential \ - git \ - postgresql-server-dev-all \ - && rm -rf /var/lib/apt/lists/* - -WORKDIR /tmp -RUN git clone https://github.com/pgvector/pgvector.git - -WORKDIR /tmp/pgvector -RUN make -RUN make install \ No newline at end of file