Skip to content

Commit 3b61256

Browse files
committed
Update Docker build process for Postgres 14. Updating versions in prep of next RC.
1 parent f63be58 commit 3b61256

File tree

5 files changed

+21
-15
lines changed

5 files changed

+21
-15
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "pgdd"
3-
version = "0.4.0-rc3"
3+
version = "0.4.0-rc4"
44
edition = "2018"
55
description = "In-database (PostgreSQL) data dictionary providing database introspection via standard SQL query syntax."
66

@@ -10,7 +10,7 @@ crate-type = ["cdylib", "rlib"]
1010
#crate-type = ["cdylib"]
1111

1212
[features]
13-
default = ["pg13"]
13+
default = ["pg14"]
1414
pg10 = ["pgx/pg10"]
1515
pg11 = ["pgx/pg11"]
1616
pg12 = ["pgx/pg12"]

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ The extension is built on the Rust [pgx framework](https://github.com/zombodb/pg
99

1010
## Compatibility
1111

12-
PgDD has been tested to work for PostgreSQL 10 through 13.
12+
PgDD has been tested to work for PostgreSQL 10 through 14.
1313

1414

1515
## Upgrading from <= v0.3
@@ -54,9 +54,9 @@ Binaries are available for Ubuntu 20.04 (bionic) and Ubuntu 21.04 (hirsute).
5454
Download and install.
5555

5656
```bash
57-
wget https://github.com/rustprooflabs/pgdd/releases/download/0.4.0.rc3/pgdd_0.4.0.rc3_focal_pg13_amd64.deb
57+
wget https://github.com/rustprooflabs/pgdd/releases/download/0.4.0-rc4/pgdd_0.4.0-rc4_focal_pg13_amd64.deb
5858

59-
sudo dpkg -i ./pgdd_0.4.0.rc3_focal_pg13_amd64.deb
59+
sudo dpkg -i ./pgdd_0.4.0-rc4_focal_pg13_amd64.deb
6060
```
6161

6262
In your database.
@@ -79,7 +79,7 @@ SELECT extname, extversion
7979
┌─────────┬────────────┐
8080
│ extname │ extversion │
8181
╞═════════╪════════════╡
82-
│ pgdd │ 0.4.0.rc3
82+
│ pgdd │ 0.4.0-rc4
8383
└─────────┴────────────┘
8484
```
8585

build/docker/pgdd-ubuntu-focal/Dockerfile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ARG DEBIAN_FRONTEND=noninteractive
1414
RUN apt-get update && apt-get upgrade -y && apt-get install -y make wget curl gnupg git
1515
RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg main" >> /etc/apt/sources.list.d/pgdg.list \
1616
&& wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
17-
RUN apt-get update
17+
RUN apt-get update && apt-get upgrade -y
1818
RUN apt-get install -y \
1919
clang-10 llvm-10 clang libz-dev strace pkg-config \
2020
libxml2 libxml2-dev libreadline8 libreadline-gplv2-dev \
@@ -26,7 +26,8 @@ RUN apt-get install -y \
2626
postgresql-server-dev-10 \
2727
postgresql-server-dev-11 \
2828
postgresql-server-dev-12 \
29-
postgresql-server-dev-13
29+
postgresql-server-dev-13 \
30+
postgresql-server-dev-14
3031

3132

3233
RUN gem install --no-document fpm
@@ -49,10 +50,12 @@ RUN /bin/bash rustup.sh -y \
4950
RUN mkdir -p /home/${USER}/.pgx/data-10 \
5051
&& mkdir /home/${USER}/.pgx/data-11 \
5152
&& mkdir /home/${USER}/.pgx/data-12 \
52-
&& mkdir /home/${USER}/.pgx/data-13
53+
&& mkdir /home/${USER}/.pgx/data-13 \
54+
&& mkdir /home/${USER}/.pgx/data-14
5355

5456
RUN cargo pgx init \
5557
--pg10=/usr/lib/postgresql/10/bin/pg_config \
5658
--pg11=/usr/lib/postgresql/11/bin/pg_config \
5759
--pg12=/usr/lib/postgresql/12/bin/pg_config \
58-
--pg13=/usr/lib/postgresql/13/bin/pg_config
60+
--pg13=/usr/lib/postgresql/13/bin/pg_config \
61+
--pg14=/usr/lib/postgresql/14/bin/pg_config

build/docker/pgdd-ubuntu-hirsute/Dockerfile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ARG DEBIAN_FRONTEND=noninteractive
1414
RUN apt-get update && apt-get upgrade -y && apt-get install -y make wget curl gnupg git
1515
RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg main" >> /etc/apt/sources.list.d/pgdg.list \
1616
&& wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
17-
RUN apt-get update
17+
RUN apt-get update && apt-get upgrade -y
1818
RUN apt-get install -y \
1919
clang-12 llvm-12 clang libz-dev strace pkg-config \
2020
libxml2 libxml2-dev libreadline8 libreadline-dev \
@@ -26,7 +26,8 @@ RUN apt-get install -y \
2626
postgresql-server-dev-10 \
2727
postgresql-server-dev-11 \
2828
postgresql-server-dev-12 \
29-
postgresql-server-dev-13
29+
postgresql-server-dev-13 \
30+
postgresql-server-dev-14
3031

3132

3233
RUN gem install --no-document fpm
@@ -49,10 +50,12 @@ RUN /bin/bash rustup.sh -y \
4950
RUN mkdir -p /home/${USER}/.pgx/data-10 \
5051
&& mkdir /home/${USER}/.pgx/data-11 \
5152
&& mkdir /home/${USER}/.pgx/data-12 \
52-
&& mkdir /home/${USER}/.pgx/data-13
53+
&& mkdir /home/${USER}/.pgx/data-13 \
54+
&& mkdir /home/${USER}/.pgx/data-14
5355

5456
RUN cargo pgx init \
5557
--pg10=/usr/lib/postgresql/10/bin/pg_config \
5658
--pg11=/usr/lib/postgresql/11/bin/pg_config \
5759
--pg12=/usr/lib/postgresql/12/bin/pg_config \
58-
--pg13=/usr/lib/postgresql/13/bin/pg_config
60+
--pg13=/usr/lib/postgresql/13/bin/pg_config \
61+
--pg14=/usr/lib/postgresql/14/bin/pg_config

pgdd.control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
comment = 'An in-database data dictionary providing database introspection via standard SQL query syntax. Developed using pgx (https://github.com/zombodb/pgx).'
2-
default_version = '0.4.0-rc3'
2+
default_version = '0.4.0-rc4'
33
module_pathname = '$libdir/pgdd'
44
relocatable = false
55
schema = dd

0 commit comments

Comments
 (0)