Skip to content

Commit

Permalink
Merge pull request #28 from cybertec-postgresql/ca-certificate-fix
Browse files Browse the repository at this point in the history
Ca certificate fix
  • Loading branch information
Schmaetz authored Jun 7, 2024
2 parents 99bc7e8 + ba2c4ae commit 288d3c2
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 2 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,8 @@ launcher/ferretdb

#Exporter_v2
docker/exporter_v2
launcher/exporter_v2
launcher/exporter_v2

# logical backup
docker/logical_backup/
scripts/logical_backup/
12 changes: 12 additions & 0 deletions docker/pgbackrest/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,13 @@ COPY --from=builder /usr/lib64 /usr/lib64
# CA
COPY --from=builder /usr/bin/ca-legacy /usr/bin/ca-legacy
COPY --from=builder /usr/bin/update-ca-trust /usr/bin/update-ca-trust
# grep
COPY --from=builder /etc/profile.d /etc/profile.d
COPY --from=builder /usr/bin/grep /usr/bin/grep
COPY --from=builder /usr/libexec /usr/libexec
# COPY --from=builder /usr/bin/update-ca-trust /usr/bin/update-ca-trust
# COPY --from=builder /usr/bin/update-ca-trust /usr/bin/update-ca-trust

# p11-kit
COPY --from=builder /etc/pkcs11 /etc/pkcs11
COPY --from=builder /usr/libexec/p11-kit /usr/libexec/p11-kit
Expand All @@ -95,12 +102,17 @@ COPY --from=builder /usr/share/pki /usr/share/pki
COPY --from=builder /etc/ssl /etc/ssl
COPY --from=builder /etc/pkcs11 /etc/pkcs11

# p11-kit-trust
COPY --from=builder /usr/bin/trust /usr/bin/

# libraries
COPY --from=builder /usr/bin/nss_wrapper.pl /usr/bin/nss_wrapper.pl
# COPY --from=builder /usr/lib64/libnss_wrapper.so /usr/lib64/libnss_wrapper.so
COPY --from=builder /usr/share/man/man1 /usr/share/man/man1
COPY --from=builder /usr/bin/envsubst /usr/bin/envsubst

RUN /usr/bin/update-ca-trust extract

# add postgres user and group
#RUN groupadd postgres -g 26 && useradd postgres -u 26 -g 26

Expand Down
2 changes: 1 addition & 1 deletion scripts/postgres/init_pgbackrest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ else
# Create Stanza and run Init-Backup
stanza=$(pgbackrest info --output=json)
if [ "$stanza" == "[]" ]; then
pgbackrest stanza-create --stanza=db1
pgbackrest stanza-create --stanza=db
pgbackrest backup --type=full --stanza=db --repo=1
echo "Finished: pgBackRest is ready for use"
else
Expand Down

0 comments on commit 288d3c2

Please sign in to comment.