From 7e192343e628c360c12accf5234b1f93dff89d7f Mon Sep 17 00:00:00 2001 From: Florent Delannoy Date: Sat, 17 Jun 2017 16:48:18 +0200 Subject: [PATCH 1/2] Use system-provided OpenSSL --- bin/_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/_build.sh b/bin/_build.sh index e4d3aa202..51a59b5de 100644 --- a/bin/_build.sh +++ b/bin/_build.sh @@ -203,7 +203,7 @@ init_build () { fi; default_requirements="${wd}/requirements-default.txt"; - use_openssl="true"; + use_openssl="false"; # Use SecureTransport instead of OpenSSL if possible, unless told otherwise if [ -z "${USE_OPENSSL-}" ]; then From 72cbb3804fd94b22188d134f7c8ae810046ba062 Mon Sep 17 00:00:00 2001 From: Florent Delannoy Date: Sat, 17 Jun 2017 16:48:52 +0200 Subject: [PATCH 2/2] Docker support --- .dockerignore | 4 ++++ Dockerfile | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 .dockerignore create mode 100644 Dockerfile diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000..1e02cb094 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,4 @@ +Dockerfile +.git +data +conf diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..585fcdc59 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,22 @@ +FROM debian:jessie-slim + +# Install prerequisites +RUN apt-get update \ + && apt-get upgrade -y \ + && apt-get install -y libsasl2-dev python-dev libldap2-dev libssl-dev curl \ + make gcc bzip2 libreadline-dev zlib1g-dev libkrb5-dev \ + python-pip libffi-dev libffi6 memcached git python-xattr + +ADD . /opt/ccs +WORKDIR /opt/ccs + +# Run configuration script +RUN ./bin/develop + +# Create a new user. The UUID can be changed, but it is necessary to set one if +# you want to mount the /data folder as a Docker volume +RUN useradd ccs-user -d /opt/ccs -u 1001 +RUN chown -R ccs-user:ccs-user /opt/ccs + +USER ccs-user +CMD ["./bin/run", "-n"]