updates

1ma · Oct 28, 2024 · fbd3cb6 · fbd3cb6
1 parent 7ed7309
commit fbd3cb6
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
@@ -57,7 +57,8 @@ jobs:
           - { context: "postgres", tags: "1maa/postgres:13-alpine", build-arg: "POSTGRES_VERSION=13.16" }
           - { context: "postgres", tags: "1maa/postgres:14-alpine", build-arg: "POSTGRES_VERSION=14.13" }
           - { context: "postgres", tags: "1maa/postgres:15-alpine", build-arg: "POSTGRES_VERSION=15.8" }
-          - { context: "postgres", tags: "1maa/postgres:16-alpine" }
+          - { context: "postgres", tags: "1maa/postgres:16-alpine", build-arg: "POSTGRES_VERSION=16.4" }
+          - { context: "postgres", tags: "1maa/postgres:17-alpine" }
           - { context: "sftp", tags: "1maa/sftp:latest" }
     steps:
       - uses: actions/checkout@v4

diff --git a/php/8.1/Dockerfile b/php/8.1/Dockerfile
@@ -1,6 +1,6 @@
 FROM 1maa/alpine:latest AS build
 
-ARG PHP_VERSION=8.1.29
+ARG PHP_VERSION=8.1.30
 ARG SECP256K1_NOSTR_EXT_VERSION=v0.1.3
 
 ENV CFLAGS="-Os -march=x86-64"

diff --git a/php/8.2/Dockerfile b/php/8.2/Dockerfile
@@ -1,6 +1,6 @@
 FROM 1maa/alpine:latest AS build
 
-ARG PHP_VERSION=8.2.23
+ARG PHP_VERSION=8.2.24
 ARG SECP256K1_NOSTR_EXT_VERSION=v0.1.3
 
 ENV CFLAGS="-Os -march=x86-64"

diff --git a/php/8.3/Dockerfile b/php/8.3/Dockerfile
@@ -1,6 +1,6 @@
 FROM 1maa/alpine:latest AS build
 
-ARG PHP_VERSION=8.3.11
+ARG PHP_VERSION=8.3.12
 ARG SECP256K1_NOSTR_EXT_VERSION=v0.1.3
 
 ENV CFLAGS="-Os -march=x86-64"

diff --git a/postgres/Dockerfile b/postgres/Dockerfile
@@ -1,17 +1,22 @@
 FROM alpine:3.20 AS builder
 
-ARG POSTGRES_VERSION=16.4
+ARG POSTGRES_VERSION=17.0
 
 WORKDIR /tmp
 
 ADD https://ftp.postgresql.org/pub/source/v${POSTGRES_VERSION}/postgresql-${POSTGRES_VERSION}.tar.gz .
 
 RUN apk add --no-cache \
+    bison \
     build-base \
+    docbook-xml \
+    docbook-xsl \
+    flex \
     libxml2-dev \
     libxslt-dev \
     linux-headers \
     openssl-dev \
+    perl \
     readline-dev \
     zlib-dev \
  && tar zxof postgresql-${POSTGRES_VERSION}.tar.gz \
@@ -25,16 +30,16 @@ RUN apk add --no-cache \
     --with-ssl=openssl \
     --without-icu
 
-RUN make -C postgresql-${POSTGRES_VERSION} world -j$(nproc) \
+RUN make -C postgresql-${POSTGRES_VERSION} world \
  && make -C postgresql-${POSTGRES_VERSION} install-world \
  && rm -rf /tmp/pgsql/share/doc \
  && rm -rf /tmp/pgsql/share/man
 
 
-FROM 1maa/alpine:latest AS postgis
+FROM 1maa/alpine:3.20 AS postgis
 
 ARG PGTAP_VERSION=1.3.3
-ARG POSTGIS_VERSION=3.4.2
+ARG POSTGIS_VERSION=3.5.0
 
 WORKDIR /tmp
 
@@ -95,7 +100,7 @@ COPY --from=postgis /usr/local/bin/shp2pgsql             /usr/local/bin
 COPY --from=postgis /usr/local/lib/postgis-3.so          /usr/local/lib
 COPY --from=postgis /usr/local/lib/postgis_raster-3.so   /usr/local/lib
 COPY --from=postgis /usr/local/lib/postgis_topology-3.so /usr/local/lib
-COPY --from=postgis /usr/local/share/contrib/postgis-3.4 /usr/local/share/contrib/postgis-3.4
+COPY --from=postgis /usr/local/share/contrib/postgis-3.5 /usr/local/share/contrib/postgis-3.5
 COPY --from=cleanup /tmp                                 /usr/local/share/extension
 
 COPY docker-entrypoint.sh /usr/local/bin