From 9dbc36e42651331980b1b475c5af07c12859e33d Mon Sep 17 00:00:00 2001
From: Dmitry Verkhoturov <paskal.07@gmail.com>
Date: Sun, 6 Feb 2022 23:34:43 +0100
Subject: [PATCH] remove explicit /srv/ usage from docker-compose files

We have plenty of paths used in the application, but two of them
are hardcoded in examples all over the code for historical reasons.

I found that by default in Docker, the path would resolve to the value
we are setting it explicitly to, so it doesn't make sense to set
a few variables we are setting now explicitly.
---
 backend/_example/memory_store/compose-dev-memstore.yml | 1 -
 compose-dev-backend.yml                                | 2 --
 compose-dev-frontend.yml                               | 2 --
 docker-compose.yml                                     | 2 --
 site/src/docs/manuals/kubernetes/index.md              | 4 ----
 site/src/docs/manuals/reproxy/index.md                 | 2 --
 6 files changed, 13 deletions(-)

diff --git a/backend/_example/memory_store/compose-dev-memstore.yml b/backend/_example/memory_store/compose-dev-memstore.yml
index d182e5be4c..805fa60541 100644
--- a/backend/_example/memory_store/compose-dev-memstore.yml
+++ b/backend/_example/memory_store/compose-dev-memstore.yml
@@ -29,7 +29,6 @@ services:
     environment:
       - REMARK_URL=http://127.0.0.1:8080
       - SECRET=123456
-      - BACKUP_PATH=/srv/var/backup
       - DEBUG=true
       - EMOJI=true
       - AUTH_ANON=true
diff --git a/compose-dev-backend.yml b/compose-dev-backend.yml
index 904faca677..56d3a75d70 100644
--- a/compose-dev-backend.yml
+++ b/compose-dev-backend.yml
@@ -35,8 +35,6 @@ services:
       #            - TIME_ZONE=GMT
       - REMARK_URL=http://127.0.0.1:8080
       - SECRET=12345
-      - STORE_BOLT_PATH=/srv/var/db
-      - BACKUP_PATH=/srv/var/backup
       - DEBUG=true
       - ADMIN_PASSWD=password
       - AUTH_DEV=true # activate local oauth "dev"
diff --git a/compose-dev-frontend.yml b/compose-dev-frontend.yml
index 7fc5bcd1ad..e887e68e8e 100644
--- a/compose-dev-frontend.yml
+++ b/compose-dev-frontend.yml
@@ -32,8 +32,6 @@ services:
     environment:
       - REMARK_URL=http://127.0.0.1:8080
       - SECRET=12345
-      - STORE_BOLT_PATH=/srv/var/db
-      - BACKUP_PATH=/srv/var/backupang
       - DEBUG=true
       - ADMIN_PASSWD=password
       - AUTH_DEV=true # activate local oauth "dev"
diff --git a/docker-compose.yml b/docker-compose.yml
index ae1a52b8fd..94a71da240 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,8 +21,6 @@ services:
     environment:
       - REMARK_URL
       - SECRET
-      - STORE_BOLT_PATH=/srv/var/db
-      - BACKUP_PATH=/srv/var/backup
       - DEBUG=true
       - AUTH_GOOGLE_CID
       - AUTH_GOOGLE_CSEC
diff --git a/site/src/docs/manuals/kubernetes/index.md b/site/src/docs/manuals/kubernetes/index.md
index fb19cc3829..836b0fa691 100644
--- a/site/src/docs/manuals/kubernetes/index.md
+++ b/site/src/docs/manuals/kubernetes/index.md
@@ -47,10 +47,6 @@ spec:
                 secretKeyRef:
                   name: remark42
                   key: SECRET
-            - name: STORE_BOLT_PATH
-              value: "/srv/var/db"
-            - name: BACKUP_PATH
-              value: "/srv/var/backup"
             - name: AUTH_GOOGLE_CID
               valueFrom:
                 secretKeyRef:
diff --git a/site/src/docs/manuals/reproxy/index.md b/site/src/docs/manuals/reproxy/index.md
index edec08e99c..3e9f71fb38 100644
--- a/site/src/docs/manuals/reproxy/index.md
+++ b/site/src/docs/manuals/reproxy/index.md
@@ -53,8 +53,6 @@ services:
       - SECRET=some-secret-thing
       - USER=app
       - REMARK_URL=https://remark42.example.com
-      - STORE_BOLT_PATH=/srv/var
-      - BACKUP_PATH=/srv/var/backup
       - CACHE_MAX_VALUE=10000000
       - IMAGE_PROXY_HTTP2HTTPS=true
       - AVATAR_RESIZE=48