8000 chore: rename postgres major variable · hscmgroup/postgres@00759d7 · GitHub
[go: up one dir, main page]
Skip to content

Commit 00759d7

Browse files
sweatybridgesweatybridge
committed
chore: rename postgres major variable
1 parent 4057e2f commit 00759d7

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

‎.github/workflows/package.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ jobs:
1919
settings:
2020
runs-on: ubuntu-20.04
2121
outputs:
22-
image_tag: ${{ steps.plv8_release.outputs.result }}-${{ steps.postgres_major.outputs.result }}
22+
image_tag: ${{ steps.plv8_release.outputs.result }}-${{ steps.postgresql_major.outputs.result }}
2323
steps:
2424
- uses: actions/checkout@v3
2525
- id: plv8_release
2626
uses: mikefarah/yq@master
2727
with:
2828
cmd: yq '.plv8_release' 'ansible/vars.yml'
29-
- id: postgres_major
29+
- id: postgresql_major
3030
uses: mikefarah/yq@master
3131
with:
32-
cmd: yq '.postgres_major' 'ansible/vars.yml'
32+
cmd: yq '.postgresql_major' 'ansible/vars.yml'
3333

3434
package_x86:
3535
needs: settings

‎ansible/Dockerfile

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1.5-labs
2-
ARG postgres_major=15
3-
ARG postgres_minor=1
2+
ARG postgresql_major=15
3+
ARG postgresql_release=${postgresql_major}.1
44

55
ARG sfcgal_release=1.3.10
66
ARG postgis_release=3.3.2
@@ -33,15 +33,15 @@ ARG hypopg_release=1.3.1
3333
ARG pg_repack_release=1.4.8
3434
ARG pgvector_release=0.4.0
3535

36-
FROM postgres:$postgres_major.$postgres_minor as base
36+
FROM postgres:${postgresql_release} as base
3737
# Redeclare args for use in subsequent stages
3838
ARG TARGETARCH
39-
ARG postgres_major
39+
ARG postgresql_major
4040

4141
FROM base as builder
4242
# Install build dependencies
4343
RUN apt-get update && apt-get install -y \
44-
postgresql-server-dev-${postgres_major} \
44+
postgresql-server-dev-${postgresql_major} \
4545
build-essential \
4646
checkinstall \
4747
cmake \
@@ -337,13 +337,13 @@ RUN apt-get update && apt-get install -y \
337337
WORKDIR /tmp/pljava-${pljava_release}
338338
RUN mvn -T 1C clean install -Dmaven.test.skip -DskipTests -Dmaven.javadoc.skip=true
339339
# Create debian package
340-
RUN cp pljava-packaging/target/pljava-pg${postgres_major}.jar /tmp/
340+
RUN cp pljava-packaging/target/pljava-pg${postgresql_major}.jar /tmp/
341341

342342
FROM base as pljava
343343
# Download pre-built packages
344344
RUN apt-get update && apt-get install -y --download-only \
345345
default-jdk-headless \
346-
postgresql-${postgres_major}-pljava \
346+
postgresql-${postgresql_major}-pljava \
347347
&& rm -rf /var/lib/apt/lists/*
348348
RUN mv /var/cache/apt/archives/*.deb /tmp/
349349

@@ -377,7 +377,7 @@ RUN checkinstall -D --install=no --fstrans=no --backup=no --pakdir=/tmp --nodoc
377377
FROM scratch as plv8-deb
378378
COPY --from=plv8-source /tmp/*.deb /tmp/
379379

380-
FROM ghcr.io/supabase/plv8:${plv8_release}-pg${postgres_major} as plv8
380+
FROM ghcr.io/supabase/plv8:${plv8_release}-pg${postgresql_major} as plv8
381381

382382
####################
383383
# 14-pg_plan_filter.yml
@@ -496,7 +496,7 @@ RUN checkinstall -D --install=no --fstrans=no --backup=no --pakdir=/tmp --requir
496496
FROM base as pg_graphql
497497
# Download package archive
498498
ARG pg_graphql_release
499-
ADD "https://github.com/supabase/pg_graphql/releases/download/v${pg_graphql_release}/pg_graphql-v${pg_graphql_release}-pg${postgres_major}-${TARGETARCH}-linux-gnu.deb" \
499+
ADD "https://github.com/supabase/pg_graphql/releases/download/v${pg_graphql_release}/pg_graphql-v${pg_graphql_release}-pg${postgresql_major}-${TARGETARCH}-linux-gnu.deb" \
500500
/tmp/pg_graphql.deb
501501

502502
####################
@@ -529,7 +529,7 @@ RUN checkinstall -D --install=no --fstrans=no --backup=no --pakdir=/tmp --nodoc
529529
FROM base as pg_jsonschema
530530
# Download package archive
531531
ARG pg_jsonschema_release
532-
ADD "https://github.com/supabase/pg_jsonschema/releases/download/v${pg_jsonschema_release}/pg_jsonschema-v${pg_jsonschema_release}-pg${postgres_major}-${TARGETARCH}-linux-gnu.deb" \
532+
ADD "https://github.com/supabase/pg_jsonschema/releases/download/v${pg_jsonschema_release}/pg_jsonschema-v${pg_jsonschema_release}-pg${postgresql_major}-${TARGETARCH}-linux-gnu.deb" \
533533
/tmp/pg_jsonschema.deb
534534

535535
####################
@@ -598,7 +598,7 @@ RUN apt-get update && apt-get install -y \
598598
&& rm -rf /var/lib/apt/lists/*
599599
RUN rm /tmp/source.deb
600600
RUN apt-get update && apt-get install -y --download-only \
601-
postgresql-${postgres_major}-pgdg-pgroonga \
601+
postgresql-${postgresql_major}-pgdg-pgroonga \
602602
&& rm -rf /var/lib/apt/lists/*
603603
RUN mv /var/cache/apt/archives/*.deb /tmp/
604604

@@ -608,7 +608,7 @@ RUN mv /var/cache/apt/archives/*.deb /tmp/
608608
FROM base as wrappers
609609
# Download package archive
610610
ARG wrappers_release
611-
ADD "https://github.com/supabase/wrappers/releases/download/v${wrappers_release}/wrappers-v${wrappers_release}-pg${postgres_major}-${TARGETARCH}-linux-gnu.deb" \
611+
ADD "https://github.com/supabase/wrappers/releases/download/v${wrappers_release}/wrappers-v${wrappers_release}-pg${postgresql_major}-${TARGETARCH}-linux-gnu.deb" \
612612
/tmp/wrappers.deb
613613

614614
####################
@@ -721,14 +721,14 @@ RUN apt-get update && apt-get install -y \
721721

722722
# tasks/docker/finalize.yml
723723
COPY --chown=postgres:postgres files/postgresql_config/postgresql-stdout-log.conf /etc/postgresql/logging.conf
724-
COPY --chown=postgres:postgres files/pgsodium_getkey_urandom.sh.j2 /usr/lib/postgresql/${postgres_major}/bin/pgsodium_getkey.sh
724+
COPY --chown=postgres:postgres files/pgsodium_getkey_urandom.sh.j2 /usr/lib/postgresql/${postgresql_major}/bin/pgsodium_getkey.sh
725725
COPY files/pgbouncer_config/pgbouncer_auth_schema.sql /docker-entrypoint-initdb.d/00-schema.sql
726726
COPY files/stat_extension.sql /docker-entrypoint-initdb.d/01-extension.sql
727727

728728
RUN sed -i "s/#unix_socket_directories = '\/tmp'/unix_socket_directories = '\/var\/run\/postgresql'/g" /etc/postgresql/postgresql.conf && \
729729
echo "cron.database_name = 'postgres'" >> /etc/postgresql/postgresql.conf && \
730730
echo "pljava.libjvm_location = '/usr/lib/jvm/java-11-openjdk-${TARGETARCH}/lib/server/libjvm.so'" >> /etc/postgresql/postgresql.conf && \
731-
echo "pgsodium.getkey_script= '/usr/lib/postgresql/${postgres_major}/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
731+
echo "pgsodium.getkey_script= '/usr/lib/postgresql/${postgresql_major}/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
732732
echo 'auto_explain.log_min_duration = 10s' >> /etc/postgresql/postgresql.conf
733733

734734
ENV POSTGRES_HOST=/var/run/postgresql

0 commit comments

Comments
 (0)
0