Skip to content

Commit 22e1262

Browse files
committed
Release 3.5.6 - See CHANGELOG.md
1 parent 3e79ca6 commit 22e1262

File tree

5 files changed

+14
-3
lines changed

5 files changed

+14
-3
lines changed

.github/workflows/main.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
id: prep
2020
run: |
2121
DOCKER_IMAGE=${GITHUB_REPOSITORY/docker-/}
22-
set -x
2322
if [[ $GITHUB_REF == refs/heads/* ]]; then
2423
if [[ $GITHUB_REF == refs/heads/*/* ]] ; then
2524
BRANCH="${DOCKER_IMAGE}:$(echo $GITHUB_REF | sed "s|refs/heads/||g" | sed "s|/|-|g")"

.github/workflows/manual.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
id: prep
2020
run: |
2121
DOCKER_IMAGE=${GITHUB_REPOSITORY/docker-/}
22-
set -x
2322
if [[ $GITHUB_REF == refs/heads/* ]]; then
2423
if [[ $GITHUB_REF == refs/heads/*/* ]] ; then
2524
BRANCH="${DOCKER_IMAGE}:$(echo $GITHUB_REF | sed "s|refs/heads/||g" | sed "s|/|-|g")"

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 3.5.6 2022-11-15 <dave at tiredofit dot ca>
2+
3+
### Changed
4+
- Add failure if DB_TYPE empty or malformed
5+
6+
17
## 3.5.5 2022-10-18 <dave at tiredofit dot ca>
28

39
### Changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,4 @@ RUN set -ex && \
8383
rm -rf /root/.cache /tmp/* /var/cache/apk/*
8484

8585
### S6 Setup
86-
ADD install /
86+
COPY install /

install/assets/functions/10-db-backup

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/command/with-contenv bash
22

33
bootstrap_variables() {
4+
sanity_var DB_TYPE "Set appropriate DB_TYPE"
45
case "${DB_TYPE,,}" in
56
couch* )
67
dbtype=couch
@@ -74,12 +75,18 @@ bootstrap_variables() {
7475
sqlite* )
7576
dbtype=sqlite3
7677
;;
78+
* )
79+
print_error "I don't recognize 'DB_TYPE=${DB_TYPE}' - Exitting.."
80+
exit 99
81+
;;
7782
esac
7883

7984
if [ "${BACKUP_LOCATION,,}" = "s3" ] || [ "${BACKUP_LOCATION,,}" = "minio" ] ; then
8085
file_env 'S3_KEY_ID'
8186
file_env 'S3_KEY_SECRET'
8287
fi
88+
89+
8390
}
8491

8592
backup_couch() {

0 commit comments

Comments
 (0)