Merge pull request #33 from matburt/docker_packaging

Docker packaging

Author: matburt

Makefile

@@ -31,6 +31,9 @@ sdist: dist/$(NAME)-$(VERSION).tar.gz
 dist/$(NAME)-$(VERSION).tar.gz:
 	$(DIST_PYTHON) setup.py sdist
 
+image: dist
+	docker build --rm=true -t $(IMAGE_NAME) -f ./packaging/docker/Dockerfile .
+
 dev:
 	pipenv install
 

packaging/docker/Dockerfile

@@ -0,0 +1,20 @@
+FROM centos:8
+
+ADD https://github.com/krallin/tini/releases/download/v0.18.0/tini /bin/tini
+ADD packaging/docker/entrypoint.sh /bin/entrypoint
+ADD packaging/docker/receptor.conf /tmp/receptor.conf
+RUN yum install -y python36 python3-dateutil
+ADD dist/receptor-0.1.0-py2.py3-none-any.whl /tmp/receptor-0.1.0-py2.py3-none-any.whl
+RUN pip3 install /tmp/receptor-0.1.0-py2.py3-none-any.whl
+RUN mkdir -p /receptor && \
+    chmod +x /bin/tini /bin/entrypoint && \
+    rm -rf /var/cache/yum
+VOLUME /receptor
+ENV LANG=en_US.UTF-8
+ENV LANGUAGE=en_US:en
+ENV LC_ALL=en_US.UTF-8
+ENV HOME=/receptor
+EXPOSE 8888/tcp
+WORKDIR /receptor
+ENTRYPOINT ["entrypoint"]
+CMD ["receptor", "-c", "/receptor/receptor.conf", "node"]

packaging/docker/entrypoint.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# In OpenShift, containers are run as a random high number uid
+# that doesn't exist in /etc/passwd, but Ansible module utils
+# require a named user. So if we're in OpenShift, we need to make
+# one before Ansible runs.
+if [ `id -u` -ge 500 ] || [ -z "${CURRENT_UID}" ]; then
+
+  cat << EOF > /tmp/passwd
+root:x:0:0:root:/root:/bin/bash
+receptor:x:`id -u`:`id -g`:,,,:/receptor:/bin/bash
+EOF
+
+  cat /tmp/passwd > /etc/passwd
+  rm /tmp/passwd
+fi
+
+if [ ! -f /receptor/receptor.conf ]; then
+    cp /tmp/receptor.conf /receptor/receptor.conf
+fi
+
+exec tini -- "${@}"

packaging/docker/receptor.conf

@@ -0,0 +1,3 @@
+[default]
+data_dir=/receptor/data
+debug=True

receptor/__main__.py

@@ -1,11 +1,8 @@
-import argparse
-import datetime
 import logging
 import logging.config
 import sys
 
 from .config import ReceptorConfig
-from .receptor import Receptor
 
 logger = logging.getLogger(__name__)
 

receptor/config.py

@@ -30,6 +30,7 @@
     },
 }
 
+
 def py_class(class_spec):
     if class_spec not in SINGLETONS:
         module_name, class_name = class_spec.rsplit('.', 1)
@@ -256,8 +257,8 @@ def __init__(self, args=None):
         self.parse_options(args)
 
     def add_config_option(self, section, key, cli=True, short_option='', long_option='',
-            default_value=None, set_value=None, value_type=None, listof=None, subparse=True,
-            hint=None):
+                          default_value=None, set_value=None, value_type=None, listof=None, subparse=True,
+                          hint=None):
 
         config_entry = '%s_%s' % (section, key)
         if cli:
@@ -404,7 +405,7 @@ def _enforce_value_type(self, value, value_type):
     def go(self):
         if not self._parsed_args:
             raise ReceptorRuntimeError("there are no parsed args yet")
-        elif not hasattr(self._parsed_args, 'subparser_name'):
+        elif not hasattr(self._parsed_args, 'func'):
             raise ReceptorRuntimeError("you must specify a subcommand (%s)." % (", ".join(SUBCOMMAND_EXTRAS.keys()),))
         self._parsed_args.func(self)
 

receptor/controller.py

@@ -14,6 +14,7 @@ def connect_to_socket(socket_path):
     sock.connect(socket_path)
     return sock
 
+
 def send_directive(directive, recipient, payload, sock):
     if payload == '-':
         payload = sys.stdin.read()
@@ -28,6 +29,7 @@ def send_directive(directive, recipient, payload, sock):
 
     return response
 
+
 # FIXME: the socket path is in the config, it shouldn't need to be passed as an arg here
 def mainloop(receptor, socket_path, loop=asyncio.get_event_loop()):
     config = receptor.config

receptor/receptor.py

@@ -24,7 +24,7 @@ def __init__(self, config, node_id=None, router_cls=None,
         self.controller_connections = []
         self.base_path = os.path.join(self.config.default_data_dir, self.node_id)
         if not os.path.exists(self.base_path):
-            os.mkdir(os.path.join(self.config.default_data_dir, self.node_id))
+            os.makedirs(os.path.join(self.config.default_data_dir, self.node_id))
         self.connection_manifest_path = os.path.join(self.base_path, "connection_manifest")
         self.stop = False