Commit dd9f0d90 authored by Aurélien Dunand's avatar Aurélien Dunand
Browse files

Update docker stuff

parent b1d26316

Dockerfile

+2 −2
Original line number Diff line number Diff line 
FROM pypy:2-5.10-slim



RUN groupadd -r cc-server && useradd --no-log-init -r -g cc-server cc-server \

        && install -d -o cc-server -g cc-server /var/lib/cc-server \

        && install -d -o cc-server -g cc-server /var/lib/cc-server

VOLUME ["/var/lib/cc-server"]

WORKDIR /opt/cc-server
@@ -27,5 +27,5 @@ RUN set -ex \ 
COPY docker-entrypoint.sh .

COPY etc/cc-server.conf.docker /etc/cc-server.conf

ENTRYPOINT ["./docker-entrypoint.sh"]

CMD ["pypy", "./bin/cc-server", "-s", "-f"]

CMD ["pypy", "./bin/cc-server", "-s", "-f", "-u", "cc-server", "-g", "cc-server"]

EXPOSE 1984

docker-entrypoint.sh

+5 −9
Original line number Diff line number Diff line 
#!/bin/sh



# Only run automatically on container creation

if [ ! -f /var/lib/cc-server/container_init_ok ]; then

    # Generate self signed certif

# Generate new self signed certif (different from system overlay)

make-ssl-cert generate-default-snakeoil --force-overwrite >/dev/null 2>/dev/null

# cc-server read cert and key on each connection, even after dropping

# privileges, so this must be allowed

chown -R cc-server /etc/ssl/private/

    touch /var/lib/cc-server/container_init_ok

fi



exec "$@"

etc/cc-server.conf.docker

+1 −1
Original line number Diff line number Diff line
@@ -34,4 +34,4 @@ account_db = /var/lib/cc-server/ 
#maxcon=600



# Max idle time for cli:

#maxcon=30
 
#maxidle=30