Skip to content

Commit 288d3c2

Browse files
authored
Merge pull request #28 from cybertec-postgresql/ca-certificate-fix
Ca certificate fix
2 parents 99bc7e8 + ba2c4ae commit 288d3c2

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,8 @@ launcher/ferretdb
1212

1313
#Exporter_v2
1414
docker/exporter_v2
15-
launcher/exporter_v2
15+
launcher/exporter_v2
16+
17+
# logical backup
18+
docker/logical_backup/
19+
scripts/logical_backup/

docker/pgbackrest/Dockerfile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,13 @@ COPY --from=builder /usr/lib64 /usr/lib64
8282
# CA
8383
COPY --from=builder /usr/bin/ca-legacy /usr/bin/ca-legacy
8484
COPY --from=builder /usr/bin/update-ca-trust /usr/bin/update-ca-trust
85+
# grep
86+
COPY --from=builder /etc/profile.d /etc/profile.d
87+
COPY --from=builder /usr/bin/grep /usr/bin/grep
88+
COPY --from=builder /usr/libexec /usr/libexec
89+
# COPY --from=builder /usr/bin/update-ca-trust /usr/bin/update-ca-trust
90+
# COPY --from=builder /usr/bin/update-ca-trust /usr/bin/update-ca-trust
91+
8592
# p11-kit
8693
COPY --from=builder /etc/pkcs11 /etc/pkcs11
8794
COPY --from=builder /usr/libexec/p11-kit /usr/libexec/p11-kit
@@ -95,12 +102,17 @@ COPY --from=builder /usr/share/pki /usr/share/pki
95102
COPY --from=builder /etc/ssl /etc/ssl
96103
COPY --from=builder /etc/pkcs11 /etc/pkcs11
97104

105+
# p11-kit-trust
106+
COPY --from=builder /usr/bin/trust /usr/bin/
107+
98108
# libraries
99109
COPY --from=builder /usr/bin/nss_wrapper.pl /usr/bin/nss_wrapper.pl
100110
# COPY --from=builder /usr/lib64/libnss_wrapper.so /usr/lib64/libnss_wrapper.so
101111
COPY --from=builder /usr/share/man/man1 /usr/share/man/man1
102112
COPY --from=builder /usr/bin/envsubst /usr/bin/envsubst
103113

114+
RUN /usr/bin/update-ca-trust extract
115+
104116
# add postgres user and group
105117
#RUN groupadd postgres -g 26 && useradd postgres -u 26 -g 26
106118

scripts/postgres/init_pgbackrest.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ else
1919
# Create Stanza and run Init-Backup
2020
stanza=$(pgbackrest info --output=json)
2121
if [ "$stanza" == "[]" ]; then
22-
pgbackrest stanza-create --stanza=db1
22+
pgbackrest stanza-create --stanza=db
2323
pgbackrest backup --type=full --stanza=db --repo=1
2424
echo "Finished: pgBackRest is ready for use"
2525
else

0 commit comments

Comments
 (0)