Revert "Allow backup to be run as non-root user (#366)" (#370)

This reverts commit f64aaa6.
offen · Feb 21, 2024 · 4b3ca2e · 4b3ca2e
1 parent 02ba993
commit 4b3ca2e
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 131 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -13,8 +13,7 @@ FROM alpine:3.19
 
 WORKDIR /root
 
-RUN apk add --no-cache ca-certificates && \
-  chmod a+rw /var/lock
+RUN apk add --no-cache ca-certificates
 
 COPY --from=builder /app/cmd/backup/backup /usr/bin/backup
 

diff --git a/docs/how-tos/replace-deprecated-backup-from-snapshot.md b/docs/how-tos/replace-deprecated-backup-from-snapshot.md
@@ -2,7 +2,7 @@
 title: Replace deprecated BACKUP_FROM_SNAPSHOT usage
 layout: default
 parent: How Tos
-nav_order: 17
+nav_order: 16
 ---
 
 # Replace deprecated `BACKUP_FROM_SNAPSHOT` usage

diff --git a/docs/how-tos/replace-deprecated-backup-stop-container-label.md b/docs/how-tos/replace-deprecated-backup-stop-container-label.md
@@ -2,7 +2,7 @@
 title: Replace deprecated BACKUP_STOP_CONTAINER_LABEL setting
 layout: default
 parent: How Tos
-nav_order: 20
+nav_order: 19
 ---
 
 # Replace deprecated `BACKUP_STOP_CONTAINER_LABEL` setting

diff --git a/docs/how-tos/replace-deprecated-exec-labels.md b/docs/how-tos/replace-deprecated-exec-labels.md
@@ -2,7 +2,7 @@
 title: Replace deprecated exec-pre and exec-post labels
 layout: default
 parent: How Tos
-nav_order: 18
+nav_order: 17
 ---
 
 # Replace deprecated `exec-pre` and `exec-post` labels

diff --git a/docs/how-tos/update-deprecated-email-config.md b/docs/how-tos/update-deprecated-email-config.md
@@ -2,7 +2,7 @@
 title: Update deprecated email configuration
 layout: default
 parent: How Tos
-nav_order: 19
+nav_order: 18
 ---
 
 # Update deprecated email configuration

diff --git a/docs/how-tos/use-as-non-root.md b/docs/how-tos/use-as-non-root.md
diff --git a/docs/recipes/index.md b/docs/recipes/index.md
@@ -371,24 +371,3 @@ volumes:
   data_1:
   data_2:
 ```
-
-## Running as a non-root user
-
-```yml
-version: '3'
-
-services:
-  # ... define other services using the `data` volume here
-  backup:
-    image: offen/docker-volume-backup:v2
-    user: 1000:1000
-    environment:
-      AWS_S3_BUCKET_NAME: backup-bucket
-      AWS_ACCESS_KEY_ID: AKIAIOSFODNN7EXAMPLE
-      AWS_SECRET_ACCESS_KEY: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
-    volumes:
-      - data:/backup/my-app-backup:ro
-
-volumes:
-  data:
-```
diff --git a/test/nonroot/01conf.env b/test/nonroot/01conf.env
diff --git a/test/nonroot/docker-compose.yml b/test/nonroot/docker-compose.yml
diff --git a/test/nonroot/run.sh b/test/nonroot/run.sh
diff --git a/test/util.sh b/test/util.sh
@@ -22,7 +22,7 @@ skip () {
 
 expect_running_containers () {
   if [ "$(docker ps -q | wc -l)" != "$1" ]; then
-    fail "Expected $1 containers to be running, instead seen: "$(docker ps -q | wc -l)""
+    fail "Expected $1 containers to be running, instead seen: "$(docker ps -a | wc -l)""
   fi
   pass "$1 containers running."
 }