Skip to content

Commit 5a462da

Browse files
authored
chore: share ansible vars with docker build (#529)
* Update dockerhub-release.yml * chore: add multistage docker build * chore: update test dockerfile * chore: run build on every pr * chore: update postgresql config for extensions * chore: install vault extension * chore: install plv8 * Revert "Update dockerhub-release.yml" This reverts commit 46a2d45. * chore: add initial migration files * chore: use labs syntax for checksum and git ref * chore: use ccache to build plv8 * chore: share ansible vars with docker build * chore: remove empty line * chore: update more checksums for consistency * chore: remove checksum from dockerfile * chore: bump version to rc1
1 parent 601c3bb commit 5a462da

File tree

14 files changed

+43
-53
lines changed

14 files changed

+43
-53
lines changed

.github/workflows/test.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ jobs:
1616
POSTGRES_PASSWORD: password
1717
steps:
1818
- uses: actions/checkout@v3
19+
- id: args
20+
uses: mikefarah/yq@master
21+
with:
22+
cmd: yq 'to_entries | map(select(.value|type == "!!str")) | map(.key + "=" + .value) | join(" ")' 'ansible/vars.yml'
1923
- uses: docker/setup-buildx-action@v2
2024
- uses: docker/build-push-action@v3
2125
with:

ansible/Dockerfile

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,59 +3,35 @@ ARG postgres_major=15
33
ARG postgres_minor=1
44

55
ARG sfcgal_release=1.3.10
6-
ARG sfcgal_release_checksum=sha256:4e39b3b2adada6254a7bdba6d297bb28e1a9835a9f879b74f37e2dab70203232
76
ARG postgis_release=3.3.2
8-
ARG postgis_release_checksum=sha256:9a2a219da005a1730a39d1959a1c7cec619b1efb009b65be80ffc25bad299068
97
ARG pgrouting_release=3.4.1
10-
ARG pgrouting_release_checksum=sha256:a4e034efee8cf67582b67033d9c3ff714a09d8f5425339624879df50aff3f642
118
ARG pgtap_release=1.2.0
12-
ARG pgtap_release_checksum=sha256:9c7c3de67ea41638e14f06da5da57bac6f5bd03fea05c165a0ec862205a5c052
139
ARG pg_cron_release=1.4.2
14-
ARG pg_cron_release_checksum=sha256:3652722ea98d94d8e27bf5e708dd7359f55a818a43550d046c5064c98876f1a8
1510
ARG pgaudit_release=1.7.0
16-
ARG pgaudit_release_checksum=sha256:8f4a73e451c88c567e516e6cba7dc1e23bc91686bb6f1f77f8f3126d428a8bd8
1711
ARG pgjwt_release=9742dab1b2f297ad3811120db7b21451bca2d3c9
1812
ARG pgsql_http_release=1.5.0
19-
ARG pgsql_http_release_checksum=sha256:43efc9e82afcd110f205b86b8d28d1355d39b6b134161e9661a33a1346818f5d
2013
ARG plpgsql_check_release=2.2.5
21-
ARG plpgsql_check_release_checksum=sha256:6c3a3c5faf3f9689425c6db8a6b20bf4cd5e7144a055e29538eae980c7232573
2214
ARG pg_safeupdate_release=1.4
23-
ARG pg_safeupdate_release_checksum=sha256:ff01d3d444d35924bd3d745c5695696292e2855042da4c30fe728fb3b6648122
2415
ARG timescaledb_release=2.9.1
25-
ARG timescaledb_release_checksum=sha256:883638f2e79d25ec88ee58f603f3c81c999b6364cb4c799919d363f04089b47b
2616
ARG wal2json_release=2_5
27-
ARG wal2json_release_checksum=sha256:b516653575541cf221b99cf3f8be9b6821f6dbcfc125675c85f35090f824f00e
2817
ARG pljava_release=1.6.4
29-
ARG pljava_release_checksum=sha256:5dc5a963365cbdeb786d0ad65b6310c4c5150ef8524e273bca4085c3fb0f056f
3018
ARG plv8_release=3.1.5
31-
ARG plv8_release_checksum=sha256:1e108d5df639e4c189e1c5bdfa2432a521c126ca89e7e5a969d46899ca7bf106
3219
ARG pg_plan_filter_release=5081a7b5cb890876e67d8e7486b6a64c38c9a492
3320
ARG pg_net_release=0.7.1
34-
ARG pg_net_release_checksum=sha256:f403019fbffe5b3ec28816957ef81279dea1db5b008e3fb3bc39181a5e361940
3521
ARG rum_release=1.3.13
36-
ARG rum_release_checksum=sha256:6ab370532c965568df6210bd844ac6ba649f53055e48243525b0b7e5c4d69a7d
3722
ARG pg_hashids_release=cd0e1b31d52b394a0df64079406a14a4f7387cd6
3823
ARG libsodium_release=1.0.18
39-
ARG libsodium_release_checksum=sha256:6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1
4024
ARG pgsodium_release=3.1.5
41-
ARG pgsodium_release_checksum=sha256:bec847388a5db2a60ea9d991962ce27954d91b4c41cbcc7bd8e34472c69114d1
4225
ARG pg_graphql_release=1.1.0
4326
ARG pg_stat_monitor_release=1.1.1
44-
ARG pg_stat_monitor_release_checksum=sha256:1756a02d5a6dd66b892d15920257c69a17a67d48d3d4e2f189b681b83001ec2a
4527
ARG pg_jsonschema_release=0.1.4
46-
ARG vault_release=0.2.9
47-
ARG vault_release_checksum=sha256:1e813216395c59bb94c92be47ce8b70ba19ccc0efbcdb1fb14ed6d34a42c6cdb
28+
ARG vault_release=0.2.8
4829
ARG groonga_release=12.0.8
49-
ARG groonga_release_checksum=sha256:7770c0ff6804ef4b47b015b15736cd973cffced977c20991b16b2daa4fea6eeb
5030
ARG pgroonga_release=2.4.0
51-
ARG pgroonga_release_checksum=sha256:5baaae0e7d81f8167e278e9a34c6ed56aece8b34f5ab98f228c64408093417b3
5231
ARG wrappers_release=0.1.7
5332
ARG hypopg_release=1.3.1
54-
ARG hypopg_release_checksum=sha256:e7f01ee0259dc1713f318a108f987663d60f3041948c2ada57a94b469565ca8e
5533
ARG pg_repack_release=1.4.8
56-
ARG pg_repack_release_checksum=sha256:18b4d871c1abf78cf0b1b1fe6081d435d183a8dc5eb977576e7a47fe113dd4ec
5734
ARG pgvector_release=0.4.0
58-
ARG pgvector_release_checksum=sha256:b76cf84ddad452cc880a6c8c661d137ddd8679c000a16332f4f03ecf6e10bcc8
5935

6036
FROM postgres:$postgres_major.$postgres_minor as base
6137
# Redeclare args for use in subsequent stages

ansible/tasks/postgres-extensions/06-pgjwt.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
git:
44
repo: https://github.com/michelp/pgjwt.git
55
dest: /tmp/pgjwt
6-
version: master
6+
version: "{{ pgjwt_release }}"
77

88
- name: pgjwt - install
99
make:

ansible/tasks/postgres-extensions/11-wal2json.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
git:
44
repo: https://github.com/eulerto/wal2json.git
55
dest: /tmp/wal2json
6-
version: "{{ wal2json_commit_sha }}"
6+
version: "wal2json_{{ wal2json_release }}"
77

88
- name: wal2json - install
99
make:

ansible/tasks/postgres-extensions/13-plv8.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
git:
2727
repo: https://github.com/plv8/plv8.git
2828
dest: /tmp/plv8
29-
version: "{{ plv8_commit_version }}"
29+
version: "{{ plv8_release }}"
3030
become: yes
3131

3232
- name: Create a symbolic link

ansible/tasks/postgres-extensions/14-pg_plan_filter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
git:
44
repo: https://github.com/pgexperts/pg_plan_filter.git
55
dest: /tmp/pg_plan_filter
6-
version: "{{ pg_plan_filter_commit_version }}"
6+
version: "{{ pg_plan_filter_release }}"
77
become: yes
88

99
- name: pg_plan_filter - build

ansible/tasks/postgres-extensions/17-pg_hashids.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
git:
44
repo: https://github.com/iCyberon/pg_hashids.git
55
dest: /tmp/pg_hashids
6-
version: master
6+
version: "{{ pg_hashids_release }}"
77

88
- name: pg_hashids - build
99
make:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
- name: install pg_graphql
22
ansible.builtin.apt:
3-
deb: "https://github.com/supabase/pg_graphql/releases/download/{{ pg_graphql_release }}/pg_graphql-{{ pg_graphql_release }}-pg{{ postgresql_major }}-{{ platform }}-linux-gnu.deb"
3+
deb: "https://github.com/supabase/pg_graphql/releases/download/v{{ pg_graphql_release }}/pg_graphql-v{{ pg_graphql_release }}-pg{{ postgresql_major }}-{{ platform }}-linux-gnu.deb"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
- name: install pg_jsonschema
22
ansible.builtin.apt:
3-
deb: "https://github.com/supabase/pg_jsonschema/releases/download/{{ pg_jsonschema_release }}/pg_jsonschema-{{ pg_jsonschema_release }}-pg{{ postgresql_major }}-{{ platform }}-linux-gnu.deb"
3+
deb: "https://github.com/supabase/pg_jsonschema/releases/download/v{{ pg_jsonschema_release }}/pg_jsonschema-v{{ pg_jsonschema_release }}-pg{{ postgresql_major }}-{{ platform }}-linux-gnu.deb"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
- name: install wrappers
22
ansible.builtin.apt:
3-
deb: "https://github.com/supabase/wrappers/releases/download/{{ wrappers_release }}/wrappers-{{ wrappers_release }}-pg{{ postgresql_major }}-{{ platform }}-linux-gnu.deb"
3+
deb: "https://github.com/supabase/wrappers/releases/download/v{{ wrappers_release }}/wrappers-v{{ wrappers_release }}-pg{{ postgresql_major }}-{{ platform }}-linux-gnu.deb"

ansible/tasks/postgres-extensions/26-hypopg.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
git:
44
repo: https://github.com/HypoPG/hypopg.git
55
dest: /tmp/hypopg
6-
version: "{{ hypopg_commit_sha }}"
6+
version: "{{ hypopg_release }}"
77

88
- name: hypopg - install
99
make:

ansible/tasks/postgres-extensions/28-pgvector.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
git:
44
repo: https://github.com/pgvector/pgvector.git
55
dest: /tmp/pgvector
6-
version: '{{ pgvector_release }}'
6+
version: 'v{{ pgvector_release }}'
77
become: yes
88

99
- name: pgvector - build

ansible/vars.yml

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ nginx_release_checksum: sha1:419efb77b80f165666e2ee406ad8ae9b845aba93
3434
wal_g_release: "v2.0.1"
3535

3636
sfcgal_release: "1.3.10"
37-
sfcgal_release_checksum: sha1:f4add34a00afb0b5f594685fc646565a2bda259b
37+
sfcgal_release_checksum: sha256:4e39b3b2adada6254a7bdba6d297bb28e1a9835a9f879b74f37e2dab70203232
3838

3939
postgres_exporter_release: "0.9.0"
4040
postgres_exporter_release_checksum:
@@ -60,64 +60,74 @@ pg_cron_release_checksum: sha256:3652722ea98d94d8e27bf5e708dd7359f55a818a43550d0
6060
pgaudit_release: "1.7.0"
6161
pgaudit_release_checksum: sha256:8f4a73e451c88c567e516e6cba7dc1e23bc91686bb6f1f77f8f3126d428a8bd8
6262

63+
pgjwt_release: 9742dab1b2f297ad3811120db7b21451bca2d3c9
64+
6365
pgsql_http_release: "1.5.0"
6466
pgsql_http_release_checksum: sha256:43efc9e82afcd110f205b86b8d28d1355d39b6b134161e9661a33a1346818f5d
6567

6668
plpgsql_check_release: "2.2.5"
6769
plpgsql_check_release_checksum: sha256:6c3a3c5faf3f9689425c6db8a6b20bf4cd5e7144a055e29538eae980c7232573
6870

6971
pg_safeupdate_release: "1.4"
70-
pg_safeupdate_release_checksum: sha1:942dacd0ebce6123944212ffb3d6b5a0c09174f9
72+
pg_safeupdate_release_checksum: sha256:ff01d3d444d35924bd3d745c5695696292e2855042da4c30fe728fb3b6648122
7173

7274
timescaledb_release: "2.9.1"
75+
timescaledb_release_checksum: sha256:883638f2e79d25ec88ee58f603f3c81c999b6364cb4c799919d363f04089b47b
7376

74-
wal2json_commit_sha: 770872b890f9e122290f178e7c7bfa19ec7afa94
77+
wal2json_release: "2_5"
78+
wal2json_release_checksum: sha256:b516653575541cf221b99cf3f8be9b6821f6dbcfc125675c85f35090f824f00e
7579

7680
supautils_release: "1.7.0"
7781
supautils_release_checksum: sha256:e2353040262bd7a1720099f4a03ec485b05c74a202956aa1361e422f8765c6b3
7882

79-
pljava_release: "a5bfeca83cea2c4b844758a9c76db337392892e3"
80-
pljava_release_checksum: sha1:550bea791c404c9d62050fd9c330e162bab20763
83+
pljava_release: master
84+
pljava_release_checksum: sha256:e99b1c52f7b57f64c8986fe6ea4a6cc09d78e779c1643db060d0ac66c93be8b6
8185

82-
plv8_commit_version: bcddd92f71530e117f2f98b92d206dafe824f73a
86+
plv8_release: "3.1.5"
87+
plv8_release_checksum: sha256:1e108d5df639e4c189e1c5bdfa2432a521c126ca89e7e5a969d46899ca7bf106
8388

84-
pg_plan_filter_commit_version: 5081a7b5cb890876e67d8e7486b6a64c38c9a492
89+
pg_plan_filter_release: 5081a7b5cb890876e67d8e7486b6a64c38c9a492
8590

8691
pg_net_release: "0.7.1"
87-
pg_net_release_checksum: sha1:1df576745a320b6faa78cff5067cad9bdd4cfbcb
92+
pg_net_release_checksum: sha256:f403019fbffe5b3ec28816957ef81279dea1db5b008e3fb3bc39181a5e361940
8893

8994
rum_release: "1.3.13"
9095
rum_release_checksum: sha256:6ab370532c965568df6210bd844ac6ba649f53055e48243525b0b7e5c4d69a7d
9196

97+
pg_hashids_release: cd0e1b31d52b394a0df64079406a14a4f7387cd6
98+
9299
vector_x86_deb: "https://packages.timber.io/vector/0.22.3/vector_0.22.3-1_amd64.deb"
93100
vector_arm_deb: "https://packages.timber.io/vector/0.22.3/vector_0.22.3-1_arm64.deb"
94101

95102
libsodium_release: "1.0.18"
96-
libsodium_release_checksum: sha1:795b73e3f92a362fabee238a71735579bf46bb97
103+
libsodium_release_checksum: sha256:6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1
97104

98105
pgsodium_release: "3.1.5"
99106
pgsodium_release_checksum: sha256:bec847388a5db2a60ea9d991962ce27954d91b4c41cbcc7bd8e34472c69114d1
100107

101-
pg_graphql_release: "v1.1.0"
108+
pg_graphql_release: "1.1.0"
102109

103-
pg_jsonschema_release: "v0.1.4"
110+
pg_jsonschema_release: "0.1.4"
104111

105112
pg_stat_monitor_release: "1.1.1"
113+
pg_stat_monitor_release_checksum: sha256:1756a02d5a6dd66b892d15920257c69a17a67d48d3d4e2f189b681b83001ec2a
106114

107115
vault_release: "0.2.8"
108116
vault_release_checksum: sha256:842cdee6d5b586b1baacccfaa08b45d56566987af87952a5fe5ee80b24400754
109117

110118
groonga_release: "12.0.8"
111-
groonga_release_checksum: sha1:32aee787efffc2a22760fde946fb6462286074e2
119+
groonga_release_checksum: sha256:7770c0ff6804ef4b47b015b15736cd973cffced977c20991b16b2daa4fea6eeb
112120

113121
pgroonga_release: "2.4.0"
114-
pgroonga_release_checksum: sha1:235d67e8487b318e656d4d3016a49c14fae0512d
122+
pgroonga_release_checksum: sha256:5baaae0e7d81f8167e278e9a34c6ed56aece8b34f5ab98f228c64408093417b3
115123

116-
wrappers_release: "v0.1.7"
124+
wrappers_release: "0.1.7"
117125

118-
hypopg_commit_sha: 57d711bc4e37164c8edac81580a5f477e2a33d86
126+
hypopg_release: "1.3.1"
127+
hypopg_release_checksum: sha256:e7f01ee0259dc1713f318a108f987663d60f3041948c2ada57a94b469565ca8e
119128

120129
pg_repack_release: "1.4.8"
121-
pg_repack_release_checksum: sha1:74e54f43f6c062644e442224eacc2a2bc95a04ef
130+
pg_repack_release_checksum: sha256:18b4d871c1abf78cf0b1b1fe6081d435d183a8dc5eb977576e7a47fe113dd4ec
122131

123-
pgvector_release: "v0.4.0"
132+
pgvector_release: "0.4.0"
133+
pgvector_release_checksum: sha256:b76cf84ddad452cc880a6c8c661d137ddd8679c000a16332f4f03ecf6e10bcc8

common.vars.pkr.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
postgres-version = "15.1.0.38"
1+
postgres-version = "15.1.0.39-rc1"

0 commit comments

Comments
 (0)