File tree Expand file tree Collapse file tree 2 files changed +45
-4
lines changed Expand file tree Collapse file tree 2 files changed +45
-4
lines changed Original file line number Diff line number Diff line change @@ -27,14 +27,17 @@ jobs:
27
27
RUNNERIMG_IDENTITY :
" [email protected] "
28
28
RUNNERIMG_ISSUER : " https://accounts.google.com"
29
29
steps :
30
- - uses : actions/checkout@v4
30
+ - uses : actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # ratchet:actions/checkout@v4
31
+ - uses : actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # ratchet:actions/checkout@v4
31
32
with :
32
33
repository : zalando/spilo
33
34
fetch-depth : ' 0'
34
35
fetch-tags : ' true'
35
- - name : Find latest tag
36
+ path : spilo
37
+ - name : Checkout latest tag
36
38
shell : bash
37
39
run : |
40
+ cd spilo || exit 1
38
41
wanted_tag=$(git tag --list --sort=committerdate | tail -n 1)
39
42
echo "Selected tag ${wanted_tag}"
40
43
if [[ -z "$wanted_tag" ]]; then
46
49
exit 2
47
50
fi
48
51
git checkout "$wanted_tag"
52
+ - name : Apply pg_stat_monitor patch
53
+ shell : bash
54
+ run : |
55
+ cd spilo || exit 1
56
+ patch -p1 < ../pg_stat_monitor.patch
49
57
- name : Install cosign
50
58
uses :
sigstore/cosign-installer@398d4b0eeef1380460a10c8013a76f728fb906ac # ratchet:sigstore/[email protected]
51
59
with :
56
64
id : build-push-sign
57
65
with :
58
66
name : postgres-image
59
- context : postgres-appliance
60
- dockerfile : postgres-appliance/Dockerfile
67
+ context : spilo/ postgres-appliance
68
+ dockerfile : spilo/ postgres-appliance/Dockerfile
61
69
build_args : |
62
70
ADDITIONAL_LOCALES=nb_NO
63
71
TIMESCALEDB_APACHE_ONLY=false
Original file line number Diff line number Diff line change
1
+ diff --git a/postgres-appliance/build_scripts/base.sh b/postgres-appliance/build_scripts/base.sh
2
+ index ff885c5..5059351 100644
3
+ --- a/postgres-appliance/build_scripts/base.sh
4
+ +++ b/postgres-appliance/build_scripts/base.sh
5
+ @@ -64,6 +64,7 @@ apt-get install -y \
6
+ brotli \
7
+ libbrotli1 \
8
+ python3.10 \
9
+ + python3-pip \
10
+ python3-psycopg2
11
+
12
+ # forbid creation of a main cluster when package is installed
13
+ @@ -180,6 +181,12 @@ if [ "$DEMO" != "true" ]; then
14
+ done
15
+ fi
16
+
17
+ + pip3 install pgxnclient
18
+ + for version in $DEB_PG_SUPPORTED_VERSIONS; do
19
+ + USE_PGXS=1 pgxn install --pg_config="/usr/lib/postgresql/${version}/bin/pg_config" pg_stat_monitor
20
+ + done
21
+ + pip3 uninstall --yes pgxnclient
22
+ +
23
+ # make it possible for cron to work without root
24
+ gcc -s -shared -fPIC -o /usr/local/lib/cron_unprivileged.so cron_unprivileged.c
25
+
26
+ @@ -198,6 +205,7 @@ apt-get purge -y \
27
+ postgresql \
28
+ postgresql-all \
29
+ postgresql-server-dev-* \
30
+ + python3-pip \
31
+ libpq-dev=* \
32
+ libmagic1 \
33
+ bsdmainutils
You can’t perform that action at this time.
0 commit comments