nomad
/
common
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set vecto.rs version

This commit is contained in:
Daniel Berteaud 2024-02-21 14:20:02 +01:00
parent caf42f1fdb
commit 47459e3abb
5 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
example/base_images.nomad.hcl
View File

@ -100,13 +100,13 @@ job "base_images" {
task "postgres15" {
driver = "docker"
config {
image = "danielberteaud/postgres:15.24.2-3"
image = "danielberteaud/postgres:15.24.2-4"
}
}
task "postgres16" {
driver = "docker"
config {
image = "danielberteaud/postgres:16.24.2-3"
image = "danielberteaud/postgres:16.24.2-4"
}
}
task "sqlite" {

1
example/images/postgres/Dockerfile
View File

@ -24,6 +24,7 @@ RUN set -eux &&\
export PATH=${HOME}/.cargo/bin:/usr/pgsql-${PG_VERSION}/bin/:${PATH} &&\
git clone --branch=v${PGVECTORS_VERSION} --depth=1 https://github.com/tensorchord/pgvecto.rs.git &&\
cd pgvecto.rs &&\
sed -i "s/@CARGO_VERSION@/${PGVECTORS_VERSION}/g" ./vectors.control &&\
cargo install cargo-pgrx --version $(grep '^pgrx ' Cargo.toml | awk -F'\"' '{print $2}') &&\
cargo pgrx init --pg${PG_VERSION}=/usr/pgsql-${PG_VERSION}/bin/pg_config &&\
cargo pgrx install --no-default-features --features "pg${PG_VERSION}" --release &&\

24
example/prep.d/build_base_images.sh
View File

@ -150,27 +150,27 @@ if ! docker manifest inspect danielberteaud/php:83.24.2-1 > /dev/null 2>&1; then
else
echo "Image danielberteaud/php:83.24.2-1 already available"
fi
if ! docker manifest inspect danielberteaud/postgres:15.24.2-3 > /dev/null 2>&1; then
echo "Building postgres:15.24.2-3"
if ! docker manifest inspect danielberteaud/postgres:15.24.2-4 > /dev/null 2>&1; then
echo "Building postgres:15.24.2-4"
export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/postgres:15.24.2-3 -t danielberteaud/postgres15:latest -t danielberteaud/postgres:15 --build-arg=PG_VERSION=15 output/images/postgres &&\
docker push danielberteaud/postgres:15.24.2-3 &&\
docker build -t danielberteaud/postgres:15.24.2-4 -t danielberteaud/postgres15:latest -t danielberteaud/postgres:15 --build-arg=PG_VERSION=15 output/images/postgres &&\
docker push danielberteaud/postgres:15.24.2-4 &&\
docker push danielberteaud/postgres15:latest &&\
docker push danielberteaud/postgres:15 &&\
echo "danielberteaud/postgres:15.24.2-3 pushed to remote repo"
echo "danielberteaud/postgres:15.24.2-4 pushed to remote repo"
else
echo "Image danielberteaud/postgres:15.24.2-3 already available"
echo "Image danielberteaud/postgres:15.24.2-4 already available"
fi
if ! docker manifest inspect danielberteaud/postgres:16.24.2-3 > /dev/null 2>&1; then
echo "Building postgres:16.24.2-3"
if ! docker manifest inspect danielberteaud/postgres:16.24.2-4 > /dev/null 2>&1; then
echo "Building postgres:16.24.2-4"
export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/postgres:16.24.2-3 -t danielberteaud/postgres16:latest -t danielberteaud/postgres:16 --build-arg=PG_VERSION=16 output/images/postgres &&\
docker push danielberteaud/postgres:16.24.2-3 &&\
docker build -t danielberteaud/postgres:16.24.2-4 -t danielberteaud/postgres16:latest -t danielberteaud/postgres:16 --build-arg=PG_VERSION=16 output/images/postgres &&\
docker push danielberteaud/postgres:16.24.2-4 &&\
docker push danielberteaud/postgres16:latest &&\
docker push danielberteaud/postgres:16 &&\
echo "danielberteaud/postgres:16.24.2-3 pushed to remote repo"
echo "danielberteaud/postgres:16.24.2-4 pushed to remote repo"
else
echo "Image danielberteaud/postgres:16.24.2-3 already available"
echo "Image danielberteaud/postgres:16.24.2-4 already available"
fi
if ! docker manifest inspect danielberteaud/sqlite:24.2-1 > /dev/null 2>&1; then
echo "Building sqlite:24.2-1"

1
images/postgres/Dockerfile
View File

@ -24,6 +24,7 @@ RUN set -eux &&\
export PATH=${HOME}/.cargo/bin:/usr/pgsql-${PG_VERSION}/bin/:${PATH} &&\
git clone --branch=v${PGVECTORS_VERSION} --depth=1 https://github.com/tensorchord/pgvecto.rs.git &&\
cd pgvecto.rs &&\
sed -i "s/@CARGO_VERSION@/${PGVECTORS_VERSION}/g" ./vectors.control &&\
cargo install cargo-pgrx --version $(grep '^pgrx ' Cargo.toml | awk -F'\"' '{print $2}') &&\
cargo pgrx init --pg${PG_VERSION}=/usr/pgsql-${PG_VERSION}/bin/pg_config &&\
cargo pgrx install --no-default-features --features "pg${PG_VERSION}" --release &&\

4
variables.yml
View File

@ -264,7 +264,7 @@ docker:
# Postgres
postgres15:
image: postgres:15.24.2-3
image: postgres:15.24.2-4
build_args:
PG_VERSION: 15
tags:
@ -272,7 +272,7 @@ docker:
- postgres:15
postgres16:
image: postgres:16.24.2-3
image: postgres:16.24.2-4
build_args:
PG_VERSION: 16
tags: