Merge branch 'feature/memdebug' of github.com:foomo/contentserver into feature/memdebug

This commit is contained in:
Philipp Mieden 2019-05-24 16:23:28 +02:00
commit 8224e92d4d
2 changed files with 3 additions and 4 deletions

View File

@ -18,7 +18,6 @@ RUN GOARCH=amd64 GOOS=linux CGO_ENABLED=0 go build -o /contentserver
##############################
FROM alpine
ENV CONTENT_SERVER_LOG_LEVEL=error
ENV CONTENT_SERVER_ADDR=0.0.0.0:80
ENV CONTENT_SERVER_VAR_DIR=/var/lib/contentserver
ENV LOG_JSON=1
@ -32,7 +31,7 @@ VOLUME $CONTENT_SERVER_VAR_DIR
ENTRYPOINT ["/usr/sbin/contentserver"]
CMD ["-address=$CONTENT_SERVER_ADDR", "-log-level=$CONTENT_SERVER_LOG_LEVEL", "-var-dir=$CONTENT_SERVER_VAR_DIR"]
CMD ["-address=$CONTENT_SERVER_ADDR", "-var-dir=$CONTENT_SERVER_VAR_DIR"]
EXPOSE 80
EXPOSE 9200

View File

@ -37,7 +37,7 @@ var (
flagWebserverAddress = flag.String("webserver-address", "", "address to bind web server host:port, when empty no webserver will be spawned")
flagWebserverPath = flag.String("webserver-path", "/contentserver", "path to export the webserver on - useful when behind a proxy")
flagVarDir = flag.String("var-dir", "/var/lib/contentserver", "where to put my data")
flagDebug = flag.Bool("debug", true, "toggle debug mode")
flagDebug = flag.Bool("debug", false, "toggle debug mode")
// debugging / profiling
flagFreeOSMem = flag.Int("free-os-mem", 0, "free OS mem every X minutes")