simplify our changes

drop the versions.cfg
drop the versions -> requirements step
add something to configure in entrypoint

Dockerfile

@@ -4,16 +4,13 @@ MAINTAINER Shoobx Ops <ops@shoobx.com>
 
 WORKDIR "/opt/keas.kmi"
 
-COPY docker/build.sh versions.cfg ./
-RUN ["bash", "build.sh"]
+COPY src/ ./src/
+COPY setup.py README.txt CHANGES.txt ./
+RUN pip install -e . --no-cache-dir
 
 COPY docker/entrypoint.sh ./
 ENTRYPOINT ["bash", "entrypoint.sh"]
 
-COPY src/ ./src/
-COPY setup.py README.txt CHANGES.txt ./
-RUN pip install -e .
-
 VOLUME ["/opt/keas.kmi/keys/"]
 EXPOSE 8080
 

Makefile

@@ -13,10 +13,6 @@ all: bin/kmi
 clean:
 	git clean -dxf
 
-.PHONY: update  # generates a new frozen versions.cfg
-update: bin/buildout
-	bin/buildout update-versions-file=versions.cfg
-
 .PHONY: docker  # builds the docker image
 docker:
 	docker build -t "$(DOCKER_TAG)" .

buildout.cfg

@@ -4,7 +4,6 @@ parts = test coverage-test coverage-report python paster runserver testclient
         ctags
 versions = versions
 newest = true
-extends = versions.cfg
 
 [test]
 recipe = zc.recipe.testrunner
@@ -48,3 +47,5 @@ initialization =
 [testclient]
 recipe = zc.recipe.egg
 eggs = keas.kmi
+
+[versions]

docker/entrypoint.sh

@@ -1,13 +1,14 @@
 #!/usr/bin/env bash
 set -eux
 
-GENERATED_ZOPE_CONF_FILE="zope.conf"
-GENERATED_SERV_CONF_FILE="server.ini"
-GENERATED_MARKER="generated by $(realpath ${0})"
+GENERATED_BY="generated by $(realpath ${0})"
+# settings defaults
+: "${KMI_LOGGER_LEVEL:=INFO}"
+: "${KMI_LOGGER_ROOT_LEVEL:=WARN}"
 
-# translate env vars to config
-cat - > "${GENERATED_SERV_CONF_FILE}" <<CONFIG
-# ${GENERATED_MARKER}
+# generate config from env
+cat - > 'server.ini' <<CONFIG
+# ${GENERATED_BY}
 [app:main]
 use = egg:keas.kmi
 storage-dir=keys/
@@ -29,11 +30,11 @@ keys = console
 keys = generic
 
 [logger_root]
-level = WARN
+level = ${KMI_LOGGER_ROOT_LEVEL}
 handlers = console
 
 [logger_kmi]
-level = INFO
+level = ${KMI_LOGGER_LEVEL}
 handlers = console
 propagate = 0
 qualname = kmi
@@ -49,8 +50,8 @@ datefmt= %Y-%m-%d %H:%M:%S
 
 CONFIG
 
-cat - > "zope.conf" <<ZOPE
-# ${GENERATED_MARKER}
+cat - > 'zope.conf' <<ZOPE
+# ${GENERATED_BY}
 site-definition src/keas/kmi/application.zcml
 
 <eventlog>
@@ -68,7 +69,7 @@ ZOPE
 # resume entrypoint stuff
 if [[ "${1:-}" == 'run' ]]; then
     ls keys/
-    gunicorn --paste "${GENERATED_SERV_CONF_FILE}"
+    exec gunicorn --paste 'server.ini'
 else
     exec "$@"
 fi