From 2b7f42d0dbd966d483fa483254f4de28c329b716 Mon Sep 17 00:00:00 2001 From: Disassembler Date: Sat, 10 Feb 2018 13:11:43 +0100 Subject: [PATCH] Don't use wrapper for launching Sahana in Docker --- sahana/Dockerfile | 3 +-- sahana/docker/usr/local/bin/web2py_eden.sh | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100755 sahana/docker/usr/local/bin/web2py_eden.sh diff --git a/sahana/Dockerfile b/sahana/Dockerfile index d6ff9c2..5e916da 100644 --- a/sahana/Dockerfile +++ b/sahana/Dockerfile @@ -49,11 +49,10 @@ RUN \ && rm -r /root/.cache COPY --chown=8001:8001 docker/srv/ /srv/ -COPY docker/usr/ /usr/ VOLUME ["/srv/web2py/applications/eden/models", "/srv/web2py/applications/eden/databases", "/srv/web2py/applications/eden/uploads"] EXPOSE 8001 USER sahana WORKDIR /srv/web2py -CMD ["web2py_eden.sh"] +CMD ["./web2py.py", "-a", "eden", "-K", "eden", "-X", "-i", "0.0.0.0", "-p", "8001", "--nogui"] diff --git a/sahana/docker/usr/local/bin/web2py_eden.sh b/sahana/docker/usr/local/bin/web2py_eden.sh deleted file mode 100755 index d04a807..0000000 --- a/sahana/docker/usr/local/bin/web2py_eden.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd /srv/web2py -./web2py.py -a $(head -c 18 /dev/urandom | base64) -K eden -X -i 0.0.0.0 -p 8001 --nogui