From dbff49a0f7c0f5cc19b9d39eb1d46aea971646d9 Mon Sep 17 00:00:00 2001 From: jdmalandruccolo Date: Tue, 4 Mar 2025 17:13:52 -0800 Subject: [PATCH 1/5] setup init script --- Dockerfile.postgres | 3 +++ initdb-vector.sh | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 initdb-vector.sh diff --git a/Dockerfile.postgres b/Dockerfile.postgres index 2c28b9a..d662ec0 100644 --- a/Dockerfile.postgres +++ b/Dockerfile.postgres @@ -18,5 +18,8 @@ RUN apt-get update && apt-get install -y \ && apt-get autoremove -y \ && rm -rf /var/lib/apt/lists/* +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-vector.sh /docker-entrypoint-initdb.d/vector.sh + # log all queries CMD ["postgres", "-c", "log_statement=all"] diff --git a/initdb-vector.sh b/initdb-vector.sh new file mode 100644 index 0000000..5564b88 --- /dev/null +++ b/initdb-vector.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_vector' template db +"${psql[@]}" <<- 'EOSQL' +CREATE DATABASE template_vector IS_TEMPLATE true; +EOSQL + +# Load vector into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS vector; +EOSQL +done \ No newline at end of file From 5d876d9e6c052030a98e3367b12ec280ed1d7546 Mon Sep 17 00:00:00 2001 From: jdmalandruccolo Date: Tue, 4 Mar 2025 17:20:31 -0800 Subject: [PATCH 2/5] platform --- .github/workflows/_docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/_docker.yml b/.github/workflows/_docker.yml index eb00b2f..b15954f 100644 --- a/.github/workflows/_docker.yml +++ b/.github/workflows/_docker.yml @@ -24,8 +24,8 @@ jobs: - name: 'Build Postgres Image' run: | - docker build \ + docker buildx build \ -f Dockerfile.postgres \ - --platform linux/amd64 \ + --platform linux/amd64,linux/arm64 \ -t ghcr.io/trycompa/postgres:${{ inputs.tag }} . docker push ghcr.io/trycompa/postgres:${{ inputs.tag }} \ No newline at end of file From 24cd4ec681c3b83c85d3aab047adcfdad42b4f00 Mon Sep 17 00:00:00 2001 From: jdmalandruccolo Date: Tue, 4 Mar 2025 17:24:24 -0800 Subject: [PATCH 3/5] buildx --- .github/workflows/_docker.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/_docker.yml b/.github/workflows/_docker.yml index b15954f..fed9218 100644 --- a/.github/workflows/_docker.yml +++ b/.github/workflows/_docker.yml @@ -22,6 +22,9 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} + - name: 'Set up Docker Buildx' + uses: docker/setup-buildx-action@v3 + - name: 'Build Postgres Image' run: | docker buildx build \ From 0a2e65c2e32d9e41c2cc8b18faa66a16be93aced Mon Sep 17 00:00:00 2001 From: jdmalandruccolo Date: Tue, 4 Mar 2025 17:33:17 -0800 Subject: [PATCH 4/5] push --- .github/workflows/_docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/_docker.yml b/.github/workflows/_docker.yml index fed9218..0f5e0da 100644 --- a/.github/workflows/_docker.yml +++ b/.github/workflows/_docker.yml @@ -30,5 +30,5 @@ jobs: docker buildx build \ -f Dockerfile.postgres \ --platform linux/amd64,linux/arm64 \ - -t ghcr.io/trycompa/postgres:${{ inputs.tag }} . - docker push ghcr.io/trycompa/postgres:${{ inputs.tag }} \ No newline at end of file + -t ghcr.io/trycompa/postgres:${{ inputs.tag }} . \ + --push . From b229b11104b1317b835ae3e9291897e025066d0f Mon Sep 17 00:00:00 2001 From: jdmalandruccolo Date: Tue, 4 Mar 2025 22:35:41 -0800 Subject: [PATCH 5/5] typo --- .github/workflows/_docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/_docker.yml b/.github/workflows/_docker.yml index 0f5e0da..37a0606 100644 --- a/.github/workflows/_docker.yml +++ b/.github/workflows/_docker.yml @@ -30,5 +30,5 @@ jobs: docker buildx build \ -f Dockerfile.postgres \ --platform linux/amd64,linux/arm64 \ - -t ghcr.io/trycompa/postgres:${{ inputs.tag }} . \ + -t ghcr.io/trycompa/postgres:${{ inputs.tag }} \ --push .