Add FF_SYNCSERVER_SQLURI env var (Issue #5)

No need to put syncserver.ini in data folder

Author: crazy-max

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.8.0-RC3 (2019/01/22)
+
+* Add `FF_SYNCSERVER_SQLURI` env var (Issue #5)
+* No need to put `syncserver.ini` in data folder
+
 ## 1.8.0-RC2 (2018/07/27)
 
 * Switch to Alpine 3.8 based image

Dockerfile

@@ -27,6 +27,7 @@ RUN apk --update --no-cache add \
   && git clone https://github.com/mozilla-services/syncserver app \
   && cd app \
   && git reset --hard $SHA1_COMMIT \
+  && pip install pymysql \
   && pip install --upgrade --no-cache-dir -r requirements.txt \
   && pip install --upgrade --no-cache-dir -r dev-requirements.txt \
   && apk del build-dependencies \
@@ -38,4 +39,4 @@ EXPOSE 5000
 VOLUME [ "/data" ]
 
 ENTRYPOINT [ "/entrypoint.sh" ]
-CMD [ "/usr/local/bin/gunicorn", "--paste", "/data/syncserver.ini" ]
+CMD [ "/usr/local/bin/gunicorn", "--paste", "/syncserver.ini" ]

README.md

@@ -34,10 +34,11 @@ If you are interested, [check out](https://hub.docker.com/r/crazymax/) my other
 * `FF_SYNCSERVER_SECRET` : This is a secret key used for signing authentication tokens. It should be long and randomly-generated.
 * `FF_SYNCSERVER_ALLOW_NEW_USERS` : Set this to `false` to disable new-user signups on the server. Only request by existing accounts will be honoured (default `true`).
 * `FF_SYNCSERVER_FORCE_WSGI_ENVIRON` : Set this to `true` to work around a mismatch between public_url and the application URL as seen by python, which can happen in certain reverse-proxy hosting setups (default `false`).
+* `FF_SYNCSERVER_SQLURI` : Defines the database in which to store all server data (default `sqlite:///data/syncserver.db`).
 
 ### Volumes
 
-* `/data` : Contains SQLite database
+* `/data` : Contains SQLite database if `FF_SYNCSERVER_SQLURI` is untouched
 
 ### Ports
 

entrypoint.sh

@@ -4,6 +4,7 @@ TZ=${TZ:-UTC}
 FF_SYNCSERVER_PUBLIC_URL=${FF_SYNCSERVER_PUBLIC_URL:-http://localhost:5000/}
 FF_SYNCSERVER_ALLOW_NEW_USERS=${FF_SYNCSERVER_ALLOW_NEW_USERS:-true}
 FF_SYNCSERVER_FORCE_WSGI_ENVIRON=${FF_SYNCSERVER_FORCE_WSGI_ENVIRON:-false}
+FF_SYNCSERVER_SQLURI=${FF_SYNCSERVER_SQLURI:-sqlite:///data/syncserver.db}
 
 # Timezone
 echo "Setting timezone to ${TZ}..."
@@ -19,7 +20,7 @@ fi
 
 # Config
 echo "Generating configuration..."
-cat > "/data/syncserver.ini" <<EOL
+cat > "/syncserver.ini" <<EOL
 [server:main]
 use = egg:gunicorn
 host = 0.0.0.0
@@ -36,7 +37,7 @@ use = egg:syncserver
 public_url = ${FF_SYNCSERVER_PUBLIC_URL}
 
 # This defines the database in which to store all server data.
-sqluri = sqlite:////data/syncserver.db
+sqluri = ${FF_SYNCSERVER_SQLURI}
 
 # This is a secret key used for signing authentication tokens.
 # It should be long and randomly-generated.