Improved configuration

.dockerignore

@@ -0,0 +1,3 @@
+.DS_Store
+**/.DS_Store
+_env*

.gitignore

@@ -8,3 +8,6 @@ manta.pub
 
 # temp
 python-manta/
+
+# macos frustration
+.DS_Store

Dockerfile

@@ -2,11 +2,11 @@ FROM percona:5.6
 
 RUN apt-get update \
     && apt-get install -y \
-    python \
-    python-dev \
-    gcc \
-    curl \
-    percona-xtrabackup \
+        python \
+        python-dev \
+        gcc \
+        curl \
+        percona-xtrabackup \
     && rm -rf /var/lib/apt/lists/*
 
 # get Python drivers MySQL, Consul, and Manta
@@ -17,22 +17,25 @@ RUN curl -Ls -o get-pip.py https://bootstrap.pypa.io/get-pip.py && \
         python-Consul==0.4.7 \
         manta==2.5.0
 
-# get Containerpilot release
-RUN export CP_VERSION=2.0.1 &&\
-   curl -Lo /tmp/containerpilot.tar.gz \
-   https://github.com/joyent/containerpilot/releases/download/${CP_VERSION}/containerpilot-${CP_VERSION}.tar.gz && \
-   tar -xzf /tmp/containerpilot.tar.gz && \
-   mv /containerpilot /bin/
+# Add ContainerPilot and set its configuration file path
+ENV CONTAINERPILOT_VER 2.0.1
+ENV CONTAINERPILOT file:///etc/containerpilot.json
+RUN export CONTAINERPILOT_CHECKSUM=a4dd6bc001c82210b5c33ec2aa82d7ce83245154 \
+    && curl -Lso /tmp/containerpilot.tar.gz \
+        "https://github.com/joyent/containerpilot/releases/download/${CONTAINERPILOT_VER}/containerpilot-${CONTAINERPILOT_VER}.tar.gz" \
+    && echo "${CONTAINERPILOT_CHECKSUM}  /tmp/containerpilot.tar.gz" | sha1sum -c \
+    && tar zxf /tmp/containerpilot.tar.gz -C /usr/local/bin \
+    && rm /tmp/containerpilot.tar.gz
 
-# configure Containerpilot and MySQL
-COPY bin/* /bin/
+# configure ContainerPilot and MySQL
 COPY etc/* /etc/
+COPY bin/* /usr/local/bin/
 
 # override the parent entrypoint
 ENTRYPOINT []
 
 # use --console to get error logs to stderr
-CMD [ "/bin/containerpilot", \
+CMD [ "containerpilot", \
       "mysqld", \
       "--console", \
       "--log-bin=mysql-bin", \

README.md

@@ -7,6 +7,11 @@ MySQL designed for automated operation using the [Autopilot Pattern](http://auto
 [![ImageLayers](https://badge.imagelayers.io/autopilotpattern/mysql:latest.svg)](https://imagelayers.io/?images=autopilotpattern/mysql:latest)
 [![Join the chat at https://gitter.im/autopilotpattern/general](https://badges.gitter.im/autopilotpattern/general.svg)](https://gitter.im/autopilotpattern/general)
 
+[![DockerPulls](https://img.shields.io/docker/pulls/autopilotpattern/mysql.svg)](https://registry.hub.docker.com/u/autopilotpattern/mysql/)
+[![DockerStars](https://img.shields.io/docker/stars/autopilotpattern/mysql.svg)](https://registry.hub.docker.com/u/autopilotpattern/mysql/)
+[![ImageLayers](https://badge.imagelayers.io/autopilotpattern/mysql:latest.svg)](https://imagelayers.io/?images=autopilotpattern/mysql:latest)
+[![Join the chat at https://gitter.im/autopilotpattern/mysql](https://badges.gitter.im/autopilotpattern/mysql.svg)](https://gitter.im/autopilotpattern/mysql)
+
 ---
 
 ## Architecture

bin/triton-mysql.py

@@ -32,7 +32,7 @@
 
 log = logging.getLogger('triton-mysql')
 
-consul = pyconsul.Consul(host=os.environ.get('TRITON_MYSQL_CONSUL', 'consul'))
+consul = pyconsul.Consul(host=os.environ.get('CONSUL', 'consul'))
 config = None
 
 # consts for node state
@@ -175,7 +175,7 @@ def __init__(self):
         self.user = os.environ.get('MANTA_SUBUSER', None)
         self.role = os.environ.get('MANTA_ROLE', None)
         self.key_id = os.environ.get('MANTA_KEY_ID', None)
-        self.private_key = os.environ.get('MANTA_PRIVATE_KEY')
+        self.private_key = os.environ.get('MANTA_PRIVATE_KEY').replace('#', '\n')
         self.url = os.environ.get('MANTA_URL',
                                   'https://us-east.manta.joyent.com')
         self.bucket = os.environ.get('MANTA_BUCKET',
@@ -203,15 +203,15 @@ def put_backup(self, backup_id, infile):
 
 # ---------------------------------------------------------
 
-class Containerpilot(object):
+class ContainerPilot(object):
     """
-    Containerpilot config is where we rewrite Containerpilot's own config
+    ContainerPilot config is where we rewrite ContainerPilot's own config
     so that we can dynamically alter what service we advertise
     """
 
     def __init__(self, node):
         # TODO: we should make sure we can support JSON-in-env-var
-        # the same as Containerpilot itself
+        # the same as ContainerPilot itself
         self.node = node
         self.path = os.environ.get('CONTAINERPILOT').replace('file://', '')
         with open(self.path, 'r') as f:
@@ -231,12 +231,12 @@ def render(self):
             f.write(new_config)
 
     def reload(self):
-        """ force Containerpilot to reload its configuration """
-        log.info('Reloading Containerpilot configuration.')
+        """ force ContainerPilot to reload its configuration """
+        log.info('Reloading ContainerPilot configuration.')
         os.kill(1, signal.SIGHUP)
 
 # ---------------------------------------------------------
-# Top-level functions called by Containerpilot or forked by this program
+# Top-level functions called by ContainerPilot or forked by this program
 
 def on_start():
     """
@@ -257,24 +257,24 @@ def on_start():
 def health():
     """
     Run a simple health check. Also acts as a check for whether the
-    Containerpilot configuration needs to be reloaded (if it's been
+    ContainerPilot configuration needs to be reloaded (if it's been
     changed externally), or if we need to make a backup because the
     backup TTL has expired.
     """
     log.debug('health check fired.')
     try:
         node = MySQLNode()
-        cb = Containerpilot(node)
-        if cb.update():
-            cb.reload()
+        cp = ContainerPilot(node)
+        if cp.update():
+            cp.reload()
             return
 
-        # cb.reload() will exit early so no need to setup
+        # cp.reload() will exit early so no need to setup
         # connection until this point
         ctx = dict(user=config.repl_user,
                    password=config.repl_password,
                    database=config.mysql_db,
-                   timeout=cb.config['services'][0]['ttl'])
+                   timeout=cp.config['services'][0]['ttl'])
         node.conn = wait_for_connection(**ctx)
 
         # Update our lock on being the primary/standby.
@@ -312,15 +312,15 @@ def on_change():
     log.debug('on_change check fired.')
     try:
         node = MySQLNode()
-        cb = Containerpilot(node)
-        cb.update() # this will populate MySQLNode state correctly
+        cp = ContainerPilot(node)
+        cp.update() # this will populate MySQLNode state correctly
         if node.is_primary():
             return
 
         ctx = dict(user=config.repl_user,
                    password=config.repl_password,
                    database=config.mysql_db,
-                   timeout=cb.config['services'][0]['ttl'])
+                   timeout=cp.config['services'][0]['ttl'])
         node.conn = wait_for_connection(**ctx)
 
         # need to stop replication whether we're the new primary or not
@@ -341,8 +341,8 @@ def on_change():
                 session_id = get_session(no_cache=True)
                 if mark_with_session(PRIMARY_KEY, node.hostname, session_id):
                     node.state = PRIMARY
-                    if cb.update():
-                        cb.reload()
+                    if cp.update():
+                        cp.reload()
                     return
                 else:
                     # we lost the race to lock the session for ourselves
@@ -354,8 +354,8 @@ def on_change():
             # if it's not healthy, we'll throw an exception and start over.
             ip = get_primary_host(primary=primary)
             if ip == node.ip:
-                if cb.update():
-                    cb.reload()
+                if cp.update():
+                    cp.reload()
                 return
 
             set_primary_for_replica(node.conn)
@@ -791,9 +791,9 @@ def write_snapshot(conn):
     # we set the BACKUP_TTL before we run the backup so that we don't
     # have multiple health checks running concurrently. We then fork the
     # create_snapshot call and return. The snapshot process will be
-    # re-parented to Containerpilot
+    # re-parented to ContainerPilot
     set_backup_ttl()
-    subprocess.Popen(['python', '/bin/triton-mysql.py', 'create_snapshot'])
+    subprocess.Popen(['python', '/usr/local/bin/triton-mysql.py', 'create_snapshot'])
 
 def set_backup_ttl():
     """

docker-compose.yml

@@ -1,11 +1,33 @@
 mysql:
-    extends:
-      file: common-compose.yml
-      service: mysql
-    links:
-      - consul:consul
+    image: autopilotpattern/mysql:latest
+    mem_limit: 4g
+    restart: always
+    # expose for linking, but each container gets a private IP for
+    # internal use as well
+    expose:
+      - 3306
+    labels:
+      - triton.cns.services=mysql
+    env_file: _env
+    environment:
+      - CONTAINERPILOT=file:///etc/containerpilot.json
+      - MANTA_PRIVATE_KEY
 
 consul:
-    extends:
-      file: common-compose.yml
-      service: consul
+    image: progrium/consul:latest
+    command: -server -bootstrap -ui-dir /ui
+    restart: always
+    mem_limit: 128m
+    ports:
+      - 8500
+    expose:
+      - 53
+      - 8300
+      - 8301
+      - 8302
+      - 8400
+      - 8500
+    dns:
+      - 127.0.0.1
+    labels:
+      - triton.cns.services=consul

etc/containerbuddy.json → etc/containerpilot.json

@@ -1,11 +1,11 @@
 {
   "consul": "{{ .CONSUL }}:8500",
-  "onStart": "python /bin/triton-mysql.py",
+  "preStart": "python /usr/local/bin/triton-mysql.py",
   "services": [
     {
       "name": "mysql",
       "port": 3306,
-      "health": "python /bin/triton-mysql.py health",
+      "health": "python /usr/local/bin/triton-mysql.py health",
       "poll": 5,
       "ttl": 25
     }
@@ -14,7 +14,7 @@
     {
       "name": "mysql-primary",
       "poll": 10,
-      "onChange": "python /bin/triton-mysql.py on_change"
+      "onChange": "python /usr/local/bin/triton-mysql.py on_change"
     }
   ]
 }

local-compose.yml

@@ -1,17 +1,19 @@
 mysql:
     extends:
-      file: common-compose.yml
+      file: docker-compose.yml
       service: mysql
     mem_limit: 512m
     build: .
+    environment:
+      - CONSUL=consul
     links:
       - consul:consul
     ports:
       - 3306
 
 consul:
     extends:
-      file: common-compose.yml
+      file: docker-compose.yml
       service: consul
     ports:
     - 8500:8500