Add multiple Db backup feature

.dir-locals.el

@@ -1,4 +1,4 @@
-;;; Directory Local Variables
-;;; For more information see (info "(emacs) Directory Variables")
-
-((sh-mode . ((sh-basic-offset . 2))))
+;;; Directory Local Variables
+;;; For more information see (info "(emacs) Directory Variables")
+
+((sh-mode . ((sh-basic-offset . 2))))

.dockerignore

@@ -1,2 +1,2 @@
-*
-!src/*
+*
+!src/*

.github/workflows/build-and-push-images.yml

@@ -1,46 +1,48 @@
-name: build and push images
-
-on:
-  push:
-    branches: ['master']
-
-jobs:
-  build-and-push-image:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        include:
-          - { postgres: 11, alpine: '3.10' }
-          - { postgres: 12, alpine: '3.12' }
-          - { postgres: 13, alpine: '3.14' }
-          - { postgres: 14, alpine: '3.16' }
-          - { postgres: 15, alpine: '3.17' }
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Log in to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          push: true
-          tags: ${{ github.repository }}:${{ matrix.postgres }}
-          build-args: |
-            ALPINE_VERSION=${{ matrix.alpine }}
-          platforms: |
-            linux/amd64
-            linux/arm64
+name: build and push images
+
+on:
+  push:
+    branches: ['master']
+
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        include:
+          # - { postgres: 11, alpine: '3.10' }
+          # - { postgres: 12, alpine: '3.12' }
+          # - { postgres: 13, alpine: '3.14' }
+          # - { postgres: 14, alpine: '3.16' }
+          - { postgres: 15, alpine: '3.17' }
+          - { postgres: 16, alpine: '3.19' }
+          - { postgres: 17, alpine: '3.20' }
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Log in to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          tags: ${{ github.repository }}:${{ matrix.postgres }}
+          build-args: |
+            ALPINE_VERSION=${{ matrix.alpine }}
+          platforms: |
+            linux/amd64
+            linux/arm64

.gitignore

@@ -1,2 +1,2 @@
-.idea
+.idea
 .env

Dockerfile

@@ -1,30 +1,31 @@
-ARG ALPINE_VERSION
-FROM alpine:${ALPINE_VERSION}
-ARG TARGETARCH
-
-ADD src/install.sh install.sh
-RUN sh install.sh && rm install.sh
-
-ENV POSTGRES_DATABASE ''
-ENV POSTGRES_HOST ''
-ENV POSTGRES_PORT 5432
-ENV POSTGRES_USER ''
-ENV POSTGRES_PASSWORD ''
-ENV PGDUMP_EXTRA_OPTS ''
-ENV S3_ACCESS_KEY_ID ''
-ENV S3_SECRET_ACCESS_KEY ''
-ENV S3_BUCKET ''
-ENV S3_REGION 'us-west-1'
-ENV S3_PATH 'backup'
-ENV S3_ENDPOINT ''
-ENV S3_S3V4 'no'
-ENV SCHEDULE ''
-ENV PASSPHRASE ''
-ENV BACKUP_KEEP_DAYS ''
-
-ADD src/run.sh run.sh
-ADD src/env.sh env.sh
-ADD src/backup.sh backup.sh
-ADD src/restore.sh restore.sh
-
-CMD ["sh", "run.sh"]
+ARG ALPINE_VERSION=3.17
+FROM alpine:${ALPINE_VERSION}
+ARG TARGETARCH
+
+ADD src/install.sh install.sh
+RUN sh install.sh && rm install.sh
+
+ENV POSTGRES_DATABASES ''
+ENV POSTGRES_HOST ''
+ENV POSTGRES_PORT 5432
+ENV POSTGRES_USER ''
+ENV POSTGRES_PASSWORD ''
+ENV PGDUMP_EXTRA_OPTS ''
+ENV S3_ACCESS_KEY_ID ''
+ENV S3_SECRET_ACCESS_KEY ''
+ENV S3_BUCKET ''
+ENV S3_REGION 'us-west-1'
+ENV S3_PATH 'backup'
+ENV S3_ENDPOINT ''
+ENV S3_S3V4 'no'
+ENV SCHEDULE ''
+ENV PASSPHRASE ''
+ENV BACKUP_KEEP_DAYS ''
+ENV WEBHOOK_URL ''
+
+ADD src/run.sh run.sh
+ADD src/env.sh env.sh
+ADD src/backup.sh backup.sh
+ADD src/restore.sh restore.sh
+
+CMD ["sh", "run.sh"]

LICENSE.txt

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2017 Johannes Schickling
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2017 Johannes Schickling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,82 +1,83 @@
-# Introduction
-This project provides Docker images to periodically back up a PostgreSQL database to AWS S3, and to restore from the backup as needed.
-
-# Usage
-## Backup
-```yaml
-services:
-  postgres:
-    image: postgres:13
-    environment:
-      POSTGRES_USER: user
-      POSTGRES_PASSWORD: password
-
-  backup:
-    image: eeshugerman/postgres-backup-s3:15
-    environment:
-      SCHEDULE: '@weekly'     # optional
-      BACKUP_KEEP_DAYS: 7     # optional
-      PASSPHRASE: passphrase  # optional
-      S3_REGION: region
-      S3_ACCESS_KEY_ID: key
-      S3_SECRET_ACCESS_KEY: secret
-      S3_BUCKET: my-bucket
-      S3_PREFIX: backup
-      POSTGRES_HOST: postgres
-      POSTGRES_DATABASE: dbname
-      POSTGRES_USER: user
-      POSTGRES_PASSWORD: password
-```
-
-- Images are tagged by the major PostgreSQL version supported: `11`, `12`, `13`, `14`, or `15`.
-- The `SCHEDULE` variable determines backup frequency. See go-cron schedules documentation [here](http://godoc.org/github.com/robfig/cron#hdr-Predefined_schedules). Omit to run the backup immediately and then exit.
-- If `PASSPHRASE` is provided, the backup will be encrypted using GPG.
-- Run `docker exec <container name> sh backup.sh` to trigger a backup ad-hoc.
-- If `BACKUP_KEEP_DAYS` is set, backups older than this many days will be deleted from S3.
-- Set `S3_ENDPOINT` if you're using a non-AWS S3-compatible storage provider.
-
-## Restore
-> **WARNING:** DATA LOSS! All database objects will be dropped and re-created.
-### ... from latest backup
-```sh
-docker exec <container name> sh restore.sh
-```
-> **NOTE:** If your bucket has more than a 1000 files, the latest may not be restored -- only one S3 `ls` command is used
-### ... from specific backup
-```sh
-docker exec <container name> sh restore.sh <timestamp>
-```
-
-# Development
-## Build the image locally
-`ALPINE_VERSION` determines Postgres version compatibility. See [`build-and-push-images.yml`](.github/workflows/build-and-push-images.yml) for the latest mapping.
-```sh
-DOCKER_BUILDKIT=1 docker build --build-arg ALPINE_VERSION=3.14 .
-```
-## Run a simple test environment with Docker Compose
-```sh
-cp template.env .env
-# fill out your secrets/params in .env
-docker compose up -d
-```
-
-# Acknowledgements
-This project is a fork and re-structuring of @schickling's [postgres-backup-s3](https://github.com/schickling/dockerfiles/tree/master/postgres-backup-s3) and [postgres-restore-s3](https://github.com/schickling/dockerfiles/tree/master/postgres-restore-s3).
-
-## Fork goals
-These changes would have been difficult or impossible merge into @schickling's repo or similarly-structured forks.
-  - dedicated repository
-  - automated builds
-  - support multiple PostgreSQL versions
-  - backup and restore with one image
-
-## Other changes and features
-  - some environment variables renamed or removed
-  - uses `pg_dump`'s `custom` format (see [docs](https://www.postgresql.org/docs/10/app-pgdump.html))
-  - drop and re-create all database objects on restore
-  - backup blobs and all schemas by default
-  - no Python 2 dependencies
-  - filter backups on S3 by database name
-  - support encrypted (password-protected) backups
-  - support for restoring from a specific backup by timestamp
-  - support for auto-removal of old backups
+# Introduction
+This project provides Docker images to periodically back up a PostgreSQL database to AWS S3, and to restore from the backup as needed.
+
+# Usage
+## Backup
+```yaml
+services:
+  postgres:
+    image: postgres:13
+    environment:
+      POSTGRES_USER: user
+      POSTGRES_PASSWORD: password
+
+  backup:
+    image: eeshugerman/postgres-backup-s3:15
+    environment:
+      SCHEDULE: '@weekly'     # optional
+      BACKUP_KEEP_DAYS: 7     # optional
+      PASSPHRASE: passphrase  # optional
+      S3_REGION: region
+      S3_ACCESS_KEY_ID: key
+      S3_SECRET_ACCESS_KEY: secret
+      S3_BUCKET: my-bucket
+      S3_PREFIX: backup
+      S3_ENDPOINT: if your s3 storage is not on aws
+      POSTGRES_HOST: postgres
+      POSTGRES_DATABASES: 'dbname1,dbname2,dbname3,...'
+      POSTGRES_USER: user
+      POSTGRES_PASSWORD: password
+```
+
+- Images are tagged by the major PostgreSQL version supported: `11`, `12`, `13`, `14`, or `15`.
+- The `SCHEDULE` variable determines backup frequency. See go-cron schedules documentation [here](http://godoc.org/github.com/robfig/cron#hdr-Predefined_schedules). Omit to run the backup immediately and then exit.
+- If `PASSPHRASE` is provided, the backup will be encrypted using GPG.
+- Run `docker exec <container name> sh backup.sh` to trigger a backup ad-hoc.
+- If `BACKUP_KEEP_DAYS` is set, backups older than this many days will be deleted from S3.
+- Set `S3_ENDPOINT` if you're using a non-AWS S3-compatible storage provider.
+
+## Restore
+> **WARNING:** DATA LOSS! All database objects will be dropped and re-created.
+### ... from latest backup
+```sh
+docker exec <container name> sh restore.sh
+```
+> **NOTE:** If your bucket has more than a 1000 files, the latest may not be restored -- only one S3 `ls` command is used
+### ... from specific backup
+```sh
+docker exec <container name> sh restore.sh <timestamp>
+```
+
+# Development
+## Build the image locally
+`ALPINE_VERSION` determines Postgres version compatibility. See [`build-and-push-images.yml`](.github/workflows/build-and-push-images.yml) for the latest mapping.
+```sh
+DOCKER_BUILDKIT=1 docker build --build-arg ALPINE_VERSION=3.14 .
+```
+## Run a simple test environment with Docker Compose
+```sh
+cp template.env .env
+# fill out your secrets/params in .env
+docker compose up -d
+```
+
+# Acknowledgements
+This project is a fork and re-structuring of @schickling's [postgres-backup-s3](https://github.com/schickling/dockerfiles/tree/master/postgres-backup-s3) and [postgres-restore-s3](https://github.com/schickling/dockerfiles/tree/master/postgres-restore-s3).
+
+## Fork goals
+These changes would have been difficult or impossible merge into @schickling's repo or similarly-structured forks.
+  - dedicated repository
+  - automated builds
+  - support multiple PostgreSQL versions
+  - backup and restore with one image
+
+## Other changes and features
+  - some environment variables renamed or removed
+  - uses `pg_dump`'s `custom` format (see [docs](https://www.postgresql.org/docs/10/app-pgdump.html))
+  - drop and re-create all database objects on restore
+  - backup blobs and all schemas by default
+  - no Python 2 dependencies
+  - filter backups on S3 by database name
+  - support encrypted (password-protected) backups
+  - support for restoring from a specific backup by timestamp
+  - support for auto-removal of old backups