docker-compose changes:

1. compose namespaces containers using parent dir name... change parent dir for uniqueness
2. move specific config to .env file in jct_docker dir (.gitignore'd)
3. refactor docker-compose for version 2
4. refactor docker-compose for using mac host computer database using the bind i found and am so excited about

Gruntfile.js

@@ -69,7 +69,7 @@ module.exports = function (grunt) {
                 src: './',
                 dest: 'wp-content/themes/jonathancoulton-theme/',
                 exclusions: ['./.ftppass', './.git', './.gitignore', './.idea', './Gruntfile.js', './node_modules',
-                    './docker', './docs', './.DS_Store', './sftpcache.json', './tmp/*', './bower.json',
+                    './jct_docker', './docs', './.DS_Store', './sftpcache.json', './tmp/*', './bower.json',
                     './package.json', './README.md', './custom_bootstrap', './tests'],
                 serverSep: '/',
                 concurrency: 4,

config/encode_output_formats.php

@@ -1 +1 @@
-./../docker/encodebot/www/src/ffmpeg-output-formats.php
+./../jct_docker/encodebot/www/src/ffmpeg-output-formats.php

jct_docker/docker-compose-dev-all.yml

@@ -0,0 +1,52 @@
+version: '2'
+
+services:
+  encodebot:
+    hostname: encodebot
+    build: ./encodebot
+    ports:
+    - 81:80
+    volumes:
+      - "./encodebot/www/:/var/www/"
+      - "./encodebot/lighttpd/:/etc/lighttpd/"
+    environment:
+      ENCODE_ACCESS_KEY: testingtesting
+
+  wordpress:
+    build: ./wordpress
+    ports:
+      - 83:80
+    environment:
+      WORDPRESS_DEBUG: 1
+      WORDPRESS_DB_HOST:
+      WORDPRESS_DB_USER:
+      WORDPRESS_DB_PASSWORD:
+      WORDPRESS_DB_NAME:
+      WORDPRESS_TABLE_PREFIX:
+    extra_hosts:
+      - "dh:10.0.2.2"
+    volumes:
+    - "../../jonathancoulton-theme:/var/www/html/wp-content/themes/jonathancoulton-theme"
+    - "./wordpress/wp-content/uploads:/var/www/html/wp-content/uploads"
+    - "./uploads.ini:/usr/local/etc/php/conf.d/uploads.ini"
+
+  #### quit it with the container... use a local db
+  #db:
+  #  image: mariadb
+  #  environment:
+  #    MYSQL_ROOT_PASSWORD: 1234
+
+
+  pma:
+    build: ./pma
+    ports:
+      - 82:80
+    environment:
+      BLOWFISH_SECRET:
+      PMA_HOST:
+      PMA_PORT:
+      PMA_PROTO:
+    extra_hosts:
+      - "dh:10.0.2.2"
+    volumes:
+      - "./uploads.ini:/usr/local/etc/php/conf.d/uploads.ini"

docker/pma/Dockerfile → jct_docker/pma/Dockerfile

@@ -14,4 +14,4 @@ RUN rm -rf $PHPMYADMIN_DOCUMENT_ROOT && mkdir -p $PHPMYADMIN_DOCUMENT_ROOT
 RUN curl -SL https://files.phpmyadmin.net/phpMyAdmin/${PHPMYADMIN_VERSION}/phpMyAdmin-${PHPMYADMIN_VERSION}-english.tar.bz2 | \
     tar xjv --strip-components 1 -C $PHPMYADMIN_DOCUMENT_ROOT
 
-ADD ./config.inc.php $PHPMYADMIN_CONFIG_FILE_PATH
+COPY ./config.inc.php $PHPMYADMIN_CONFIG_FILE_PATH

docker/pma/config.inc.php → jct_docker/pma/config.inc.php

@@ -14,9 +14,9 @@
 /* Authentication type */
 $cfg['Servers'][$i]['auth_type'] = 'cookie';
 /* Server parameters */
-$cfg['Servers'][$i]['host'] = getenv('MYSQL_PORT_3306_TCP_ADDR');
-$cfg['Servers'][$i]['port'] = getenv('MYSQL_PORT_3306_TCP_PORT');
-$cfg['Servers'][$i]['connect_type'] = getenv('MYSQL_PORT_3306_TCP_PROTO');
+$cfg['Servers'][$i]['host'] = getenv('PMA_HOST');
+$cfg['Servers'][$i]['port'] = getenv('PMA_PORT');
+$cfg['Servers'][$i]['connect_type'] = getenv('PMA_PROTO');
 $cfg['Servers'][$i]['compress'] = false;
 $cfg['Servers'][$i]['AllowNoPassword'] = false;
 $cfg['Servers'][$i]['AllowRoot'] = true;

docker/wordpress/Dockerfile → jct_docker/wordpress/Dockerfile

@@ -2,7 +2,8 @@ FROM wordpress:4.7
 
 
 # from https://github.com/docker-library/docs/blob/master/php/README.md#how-to-install-more-php-extensions
+# also i like to use vim
 RUN DEBIAN_FRONTEND=noninteractive apt-get update &&  DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes \
-    libzip2 libzip-dev
+    libzip2 libzip-dev vim
 
 RUN docker-php-ext-install zip