From 2f6f9393e956ce72d75fbe16846fab4214e2de26 Mon Sep 17 00:00:00 2001
From: Jonas Kaninda <jonaskaninda@gmail.com>
Date: Sun, 4 Aug 2024 12:38:52 +0200
Subject: [PATCH] fix: fix supervisord, add container entrypoint

---
 Makefile                | 2 +-
 docker/Dockerfile       | 3 ++-
 docker/supervisord.conf | 6 ++++--
 pkg/scripts.go          | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index f5f118e..5b8864f 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ docker-run-scheduled: docker-build
 
 
 docker-run-scheduled-s3: docker-build
-	docker run --rm --network web  --name pg-bkup -v "./backup:/backup" -e "DB_HOST=${DB_HOST}" -e "DB_NAME=${DB_NAME}" -e "DB_USERNAME=${DB_USERNAME}" -e "DB_PASSWORD=${DB_PASSWORD}" -e "ACCESS_KEY=${ACCESS_KEY}" -e "SECRET_KEY=${SECRET_KEY}" -e "BUCKET_NAME=${BUCKET_NAME}" -e "S3_ENDPOINT=${S3_ENDPOINT}" -e "GPG_PASSPHRASE=${GPG_PASSPHRASE}"  ${IMAGE_NAME}  bkup backup --storage s3 --mode scheduled --path /custom-path --period "* * * * *"
+	docker run --rm --network web  --name pg-bkup -v "./backup:/backup" -e "DB_HOST=${DB_HOST}" -e "DB_NAME=${DB_NAME}" -e "DB_USERNAME=${DB_USERNAME}" -e "DB_PASSWORD=${DB_PASSWORD}" -e "ACCESS_KEY=${ACCESS_KEY}" -e "SECRET_KEY=${SECRET_KEY}" -e "BUCKET_NAME=${BUCKET_NAME}" -e "S3_ENDPOINT=${AWS_S3_ENDPOINT}" -e "GPG_PASSPHRASE=${GPG_PASSPHRASE}"  ${IMAGE_NAME} backup --storage s3 --mode scheduled --path /custom-path --period "* * * * *"
 
 docker-run-s3: docker-build
 	docker run --rm --network web --name pg-bkup -e "DB_HOST=${DB_HOST}" -e "DB_NAME=${DB_NAME}" -e "DB_USERNAME=${DB_USERNAME}" -e "DB_PASSWORD=${DB_PASSWORD}" -e "ACCESS_KEY=${ACCESS_KEY}" -e "SECRET_KEY=${SECRET_KEY}" -e "AWS_S3_BUCKET_NAME=${AWS_S3_BUCKET_NAME}" -e "S3_ENDPOINT=${AWS_S3_ENDPOINT}" -e "GPG_PASSPHRASE=${GPG_PASSPHRASE}"  ${IMAGE_NAME}  bkup backup --storage s3 --mode scheduled --path custom-path  --period "* * * * *"
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 9b47460..85cceef 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -64,4 +64,5 @@ RUN ln -s /usr/local/bin/pg-bkup /usr/local/bin/bkup
 
 ADD docker/supervisord.conf /etc/supervisor/supervisord.conf
 
-WORKDIR $WORKDIR
\ No newline at end of file
+WORKDIR $WORKDIR
+ENTRYPOINT ["/usr/local/bin/pg-bkup"]
diff --git a/docker/supervisord.conf b/docker/supervisord.conf
index 414b337..84b35a1 100644
--- a/docker/supervisord.conf
+++ b/docker/supervisord.conf
@@ -1,11 +1,13 @@
 [supervisord]
-nodemon=true
+nodaemon=true
 user=root
 logfile=/var/log/supervisor/supervisord.log
-pipfile=/var/run/supervisord.pid
+pidfile=/var/run/supervisord.pid
 
 [program:cron]
 command = /bin/bash -c "declare -p | grep -Ev '^declare -[[:alpha:]]*r' > /run/supervisord.env && /usr/sbin/cron -f -L 15"
 autostart=true
+autorestart=true
+user = root
 stderr_logfile=/var/log/cron.err.log
 stdout_logfile=/var/log/cron.out.log
\ No newline at end of file
diff --git a/pkg/scripts.go b/pkg/scripts.go
index 4c1e7f6..9e0f637 100644
--- a/pkg/scripts.go
+++ b/pkg/scripts.go
@@ -26,7 +26,7 @@ func CreateCrontabScript(disableCompression bool, storage string) {
 
 	scriptContent = fmt.Sprintf(`#!/usr/bin/env bash
 set -e
-bkup backup --dbname %s --port %s --storage %s %v
+/usr/local/bin/pg-bkup backup --dbname %s --port %s --storage %s %v
 `, os.Getenv("DB_NAME"), os.Getenv("DB_PORT"), storage, disableC)
 
 	if err := utils.WriteToFile(backupCronFile, scriptContent); err != nil {