Skip to content

Commit 0416939

Browse files
authored
fix: point to a real docker tag (#2)
* fix: point to a real docker tag * fix: ARG PG_TAG is not working for some reason * fix: source link to repo
1 parent 644d5e8 commit 0416939

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

.dockerignore

+1
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
regression.*
77
*.o
88
*.so
9+
.github/*

.github/workflows/build-image.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,6 @@ jobs:
3434
tags: ghcr.io/x-b-e/server-pg:latest
3535
build-args: |
3636
PG_MAJOR=13
37-
# outputs: type=image,name=target,annotation-index.org.opencontainers.image.description=XBE server base
38-
# cache-from: ghcr.io/x-b-e/server-base
37+
PG_TAG=13-13.3
38+
# outputs: type=image,name=target,annotation-index.org.opencontainers.image.description=XBE server pg
39+
# cache-from: ghcr.io/x-b-e/server-pg

Dockerfile

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
11
# syntax=docker/dockerfile:1
22

33
ARG PG_MAJOR="13"
4+
ARG PG_TAG="13-13.3"
45

5-
FROM postgis/postgis:${PG_MAJOR}
6+
FROM postgis/postgis:13-3.3
7+
# FROM postgis/postgis:${PG_TAG}
68

7-
LABEL org.opencontainers.image.source "https://github.com/x-b-e/server-pg"
9+
LABEL org.opencontainers.image.source "https://github.com/x-b-e/pgvector"
810
LABEL org.opencontainers.image.description "XBE server postgres with postgis, pgvector"
911
LABEL org.opencontainers.image.licenses "PostgreSQL License"
1012

11-
ARG PG_MAJOR
12-
13-
ENV PG_MAJOR=${PG_MAJOR}
13+
# ARG PG_MAJOR
14+
# ENV PG_MAJOR=${PG_MAJOR}
15+
ENV PG_MAJOR=13
1416

1517
COPY . /tmp/pgvector
1618

1719
RUN apt-get update && \
18-
apt-get install -y --no-install-recommends build-essential postgresql-server-dev-${PGMAJOR} && \
20+
apt-get install -y --no-install-recommends build-essential postgresql-server-dev-${PG_MAJOR} && \
1921
cd /tmp/pgvector && \
2022
make clean && \
2123
make OPTFLAGS="" && \
2224
make install && \
2325
mkdir /usr/share/doc/pgvector && \
2426
cp LICENSE README.md /usr/share/doc/pgvector && \
2527
rm -r /tmp/pgvector && \
26-
apt-get remove -y build-essential postgresql-server-dev-${PGMAJOR} && \
28+
apt-get remove -y build-essential postgresql-server-dev-${PG_MAJOR} && \
2729
apt-get autoremove -y && \
2830
rm -rf /var/lib/apt/lists/*

0 commit comments

Comments
 (0)