Merge remote-tracking branch 'origin/develop' for release 0.4.3

wardenenv · May 2, 2020 · 83a27a3 · 83a27a3
2 parents 85dc4c6 + de25656
commit 83a27a3
Show file tree

Hide file tree

Showing 15 changed files with 57 additions and 36 deletions.
diff --git a/.github/workflows/docker-image-php-fpm.yml b/.github/workflows/docker-image-php-fpm.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php_version: ["5.5", "5.6", "7.0", "7.1", "7.2", "7.3"]
+        php_version: ["5.5", "5.6", "7.0", "7.1", "7.2", "7.3", "7.4"]
     steps:
     - uses: actions/checkout@v1
     - run: ./images/scripts/build.sh --push "${BUILD_GROUP}"
@@ -30,7 +30,7 @@ jobs:
     needs: php-fpm
     strategy:
       matrix:
-        php_version: ["5.5", "5.6", "7.0", "7.1", "7.2", "7.3"]
+        php_version: ["5.5", "5.6", "7.0", "7.1", "7.2", "7.3", "7.4"]
     steps:
     - uses: actions/checkout@v1
     - run: ./images/scripts/build.sh --push "${BUILD_GROUP}"
@@ -46,7 +46,7 @@ jobs:
     needs: php-fpm
     strategy:
       matrix:
-        php_version: ["7.0", "7.1", "7.2", "7.3"]
+        php_version: ["7.0", "7.1", "7.2", "7.3", "7.4"]
     steps:
     - uses: actions/checkout@v1
     - run: ./images/scripts/build.sh --push "${BUILD_GROUP}"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,16 @@
 ## UNRELEASED [x.y.z](https://github.com/davidalger/warden/tree/x.y.z) (yyyy-mm-dd)
 [All Commits](https://github.com/davidalger/warden/compare/0.4.0..develop)
 
+## Version [0.4.3](https://github.com/davidalger/warden/tree/0.4.3) (2020-05-02)
+[All Commits](https://github.com/davidalger/warden/compare/0.4.2..0.4.3)
+
+**Enhancements:**
+
+* Updated init routine allowing `WARDEN_HOME_DIR` and `WARDEN_COMPOSER_DIR` to be overriden via environment variables
+* Updated environment configuration to reference `WARDEN_SSL_DIR` eliminating hard-coded `~/.warden/ssl` references
+* Updated warden global docker config to reference `WARDEN_HOME_DIR` eliminating hard-coded `~/.warden` references
+* Updated `warden up` to return an error when docker is not running rather than blindly attempt to start global services
+
 ## Version [0.4.2](https://github.com/davidalger/warden/tree/0.4.2) (2020-04-15)
 [All Commits](https://github.com/davidalger/warden/compare/0.4.1..0.4.2)
 

diff --git a/bin/warden b/bin/warden
@@ -24,9 +24,10 @@ containsElement () {
 ## define environment requirements
 readonly WARDEN_REQUIRED_DOCKER_COMPOSE="1.18.0"
 
-## define global directory paths by commands
-readonly WARDEN_HOME_DIR=~/.warden
-readonly WARDEN_SSL_DIR="${WARDEN_HOME_DIR}/ssl"
+## define and export global shared directory paths
+export readonly WARDEN_HOME_DIR="${WARDEN_HOME_DIR:-"$HOME/.warden"}"
+export readonly WARDEN_SSL_DIR="${WARDEN_HOME_DIR}/ssl"
+export readonly WARDEN_COMPOSER_DIR="${WARDEN_COMPOSER_DIR:-"$HOME/.composer"}"
 
 ## declare variables for flags and arguments
 declare WARDEN_HELP=

diff --git a/commands/up.cmd b/commands/up.cmd
@@ -38,6 +38,12 @@ for cert in $(find "${WARDEN_SSL_DIR}/certs" -type f -name "*.crt.pem" | sed -E
 	EOF
 done
 
+## verify docker is running
+if ! docker system info >/dev/null 2>&1; then
+  >&2 printf "\e[01;31mERROR\033[0m: Docker does not appear to be running. Please start Docker.\n"
+  exit 1
+fi
+
 pushd "${WARDEN_HOME_DIR}" >/dev/null
 docker-compose -p warden -f "${WARDEN_DIR}/docker/docker-compose.yml" up -d "${WARDEN_PARAMS[@]}" "$@"
 

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -7,9 +7,9 @@ services:
       - "${TRAEFIK_LISTEN:-127.0.0.1}:80:80"     # The HTTP port
       - "${TRAEFIK_LISTEN:-127.0.0.1}:443:443"   # The HTTPS port
     volumes:
-      - ~/.warden/etc/traefik/traefik.yml:/etc/traefik/traefik.yml
-      - ~/.warden/etc/traefik/dynamic.yml:/etc/traefik/dynamic.yml
-      - ~/.warden/ssl/certs:/etc/ssl/certs
+      - ${WARDEN_HOME_DIR}/etc/traefik/traefik.yml:/etc/traefik/traefik.yml
+      - ${WARDEN_HOME_DIR}/etc/traefik/dynamic.yml:/etc/traefik/dynamic.yml
+      - ${WARDEN_HOME_DIR}/ssl/certs:/etc/ssl/certs
       - /var/run/docker.sock:/var/run/docker.sock
     labels:
       - traefik.enable=true
@@ -41,7 +41,7 @@ services:
     ports:
       - "127.0.0.1:53:53/udp"
     volumes:
-      - ~/.warden/etc/dnsmasq.conf:/etc/dnsmasq.conf
+      - ${WARDEN_HOME_DIR}/etc/dnsmasq.conf:/etc/dnsmasq.conf
     labels:
       - traefik.enable=true
       - traefik.http.routers.dnsmasq.tls=true
@@ -55,7 +55,7 @@ services:
     ports:
       - "127.0.0.1:2222:22"
     volumes:
-      - ~/.warden/tunnel/ssh_key.pub:/etc/authorized_keys/user
+      - ${WARDEN_HOME_DIR}/tunnel/ssh_key.pub:/etc/authorized_keys/user
       - sshd_keys:/etc/ssh/keys
     environment:
       - |

diff --git a/environments/laravel/laravel.base.yml b/environments/laravel/laravel.base.yml
@@ -38,8 +38,8 @@ services:
     depends_on:
       - db
     volumes:
-      - ~/.warden/ssl/rootca/certs:/etc/ssl/warden-rootca-cert:ro
-      - ~/.composer:/home/www-data/.composer:delegated
+      - ${WARDEN_SSL_DIR}/rootca/certs:/etc/ssl/warden-rootca-cert:ro
+      - ${WARDEN_COMPOSER_DIR}:/home/www-data/.composer:delegated
       - .${WARDEN_WEB_ROOT:-}/:/var/www/html:delegated
 
   php-debug:
@@ -57,8 +57,8 @@ services:
     depends_on:
       - php-fpm
     volumes:
-      - ~/.warden/ssl/rootca/certs:/etc/ssl/warden-rootca-cert:ro
-      - ~/.composer:/home/www-data/.composer:delegated
+      - ${WARDEN_SSL_DIR}/rootca/certs:/etc/ssl/warden-rootca-cert:ro
+      - ${WARDEN_COMPOSER_DIR}:/home/www-data/.composer:delegated
       - .${WARDEN_WEB_ROOT:-}/:/var/www/html:delegated
 
   db:

diff --git a/environments/magento1/magento1.base.yml b/environments/magento1/magento1.base.yml
@@ -37,8 +37,8 @@ services:
     depends_on:
       - db
     volumes:
-      - ~/.warden/ssl/rootca/certs:/etc/ssl/warden-rootca-cert:ro
-      - ~/.composer:/home/www-data/.composer:delegated
+      - ${WARDEN_SSL_DIR}/rootca/certs:/etc/ssl/warden-rootca-cert:ro
+      - ${WARDEN_COMPOSER_DIR}:/home/www-data/.composer:delegated
       - .${WARDEN_WEB_ROOT:-}/:/var/www/html:delegated
 
   php-debug:
@@ -56,8 +56,8 @@ services:
     depends_on:
       - php-fpm
     volumes:
-      - ~/.warden/ssl/rootca/certs:/etc/ssl/warden-rootca-cert:ro
-      - ~/.composer:/home/www-data/.composer:delegated
+      - ${WARDEN_SSL_DIR}/rootca/certs:/etc/ssl/warden-rootca-cert:ro
+      - ${WARDEN_COMPOSER_DIR}:/home/www-data/.composer:delegated
       - .${WARDEN_WEB_ROOT:-}/:/var/www/html:delegated
 
   db:

diff --git a/environments/magento1/magento1.blackfire.base.yml b/environments/magento1/magento1.blackfire.base.yml
@@ -6,8 +6,8 @@ services:
     depends_on:
       - php-fpm
     volumes:
-      - ~/.warden/ssl/rootca/certs:/etc/ssl/warden-rootca-cert:ro
-      - ~/.composer:/home/www-data/.composer:delegated
+      - ${WARDEN_SSL_DIR}/rootca/certs:/etc/ssl/warden-rootca-cert:ro
+      - ${WARDEN_COMPOSER_DIR}:/home/www-data/.composer:delegated
       - .${WARDEN_WEB_ROOT:-}/:/var/www/html:delegated
 
   blackfire-agent:

diff --git a/environments/magento2/magento2.blackfire.darwin.yml b/environments/magento2/magento2.blackfire.darwin.yml
@@ -2,8 +2,8 @@ version: "3.5"
 services:
   php-blackfire:
     volumes:
-      - ~/.warden/ssl/rootca/certs:/etc/ssl/warden-rootca-cert:ro
-      - ~/.composer:/home/www-data/.composer:delegated
+      - ${WARDEN_SSL_DIR}/rootca/certs:/etc/ssl/warden-rootca-cert:ro
+      - ${WARDEN_COMPOSER_DIR}:/home/www-data/.composer:delegated
       - .${WARDEN_WEB_ROOT:-}/pub/media:/var/www/html/pub/media:delegated
       - appdata:/var/www/html
 

diff --git a/environments/magento2/magento2.blackfire.linux-gnu.yml b/environments/magento2/magento2.blackfire.linux-gnu.yml
@@ -2,6 +2,6 @@ version: "3.5"
 services:
   php-blackfire:
     volumes:
-      - ~/.warden/ssl/rootca/certs:/etc/ssl/warden-rootca-cert:ro
-      - ~/.composer:/home/www-data/.composer
+      - ${WARDEN_SSL_DIR}/rootca/certs:/etc/ssl/warden-rootca-cert:ro
+      - ${WARDEN_COMPOSER_DIR}:/home/www-data/.composer
       - .${WARDEN_WEB_ROOT:-}/:/var/www/html
diff --git a/environments/magento2/magento2.darwin.yml b/environments/magento2/magento2.darwin.yml
@@ -9,16 +9,16 @@ services:
 
   php-fpm:
     volumes:
-      - ~/.warden/ssl/rootca/certs:/etc/ssl/warden-rootca-cert:ro
-      - ~/.composer:/home/www-data/.composer:delegated
+      - ${WARDEN_SSL_DIR}/rootca/certs:/etc/ssl/warden-rootca-cert:ro
+      - ${WARDEN_COMPOSER_DIR}:/home/www-data/.composer:delegated
       - /run/host-services/ssh-auth.sock:/run/host-services/ssh-auth.sock
       - .${WARDEN_WEB_ROOT:-}/pub/media:/var/www/html/pub/media:delegated
       - appdata:/var/www/html
 
   php-debug:
     volumes:
-      - ~/.warden/ssl/rootca/certs:/etc/ssl/warden-rootca-cert:ro
-      - ~/.composer:/home/www-data/.composer:delegated
+      - ${WARDEN_SSL_DIR}/rootca/certs:/etc/ssl/warden-rootca-cert:ro
+      - ${WARDEN_COMPOSER_DIR}:/home/www-data/.composer:delegated
       - /run/host-services/ssh-auth.sock:/run/host-services/ssh-auth.sock
       - .${WARDEN_WEB_ROOT:-}/pub/media:/var/www/html/pub/media:delegated
       - appdata:/var/www/html

diff --git a/environments/magento2/magento2.linux-gnu.yml b/environments/magento2/magento2.linux-gnu.yml
@@ -6,14 +6,14 @@ services:
 
   php-fpm:
     volumes:
-      - ~/.warden/ssl/rootca/certs:/etc/ssl/warden-rootca-cert:ro
-      - ~/.composer:/home/www-data/.composer
+      - ${WARDEN_SSL_DIR}/rootca/certs:/etc/ssl/warden-rootca-cert:ro
+      - ${WARDEN_COMPOSER_DIR}:/home/www-data/.composer
       - ${SSH_AUTH_SOCK:-/dev/null}:/run/host-services/ssh-auth.sock
       - .${WARDEN_WEB_ROOT:-}/:/var/www/html
 
   php-debug:
     volumes:
-      - ~/.warden/ssl/rootca/certs:/etc/ssl/warden-rootca-cert:ro
-      - ~/.composer:/home/www-data/.composer
+      - ${WARDEN_SSL_DIR}/rootca/certs:/etc/ssl/warden-rootca-cert:ro
+      - ${WARDEN_COMPOSER_DIR}:/home/www-data/.composer
       - ${SSH_AUTH_SOCK:-/dev/null}:/run/host-services/ssh-auth.sock
       - .${WARDEN_WEB_ROOT:-}/:/var/www/html
diff --git a/images/php-fpm/.trigger b/images/php-fpm/.trigger
@@ -1 +1 @@
-93e54cef-08b1-450d-882a-6a8e77ab44dc
+573d8cd2-196c-47f5-8b5d-8854152564d5
diff --git a/images/php-fpm/Dockerfile b/images/php-fpm/Dockerfile
@@ -38,7 +38,11 @@ RUN PHP_VERSION=$(php -v | head -n1 | cut -d' ' -f2 | cut -d. -f1-2) \
     && cd /tmp/ioncube \
     && curl -Os https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz \
     && tar xzf ioncube_loaders_lin_x86-64.tar.gz \
-    && cp ioncube/ioncube_loader_lin_${PHP_VERSION}.so "$(php -i | grep '^extension_dir =' | cut -d' ' -f3)/ioncube_loader.so" \
+    && curl -Os https://www.ioncube.com/php-7.4.0-beta-loaders/ioncube_loaders_lin_x86-64_7.4_BETA2.tar.gz \
+    && tar xzf ioncube_loaders_lin_x86-64.tar.gz \
+    && tar xzf ioncube_loaders_lin_x86-64_7.4_BETA2.tar.gz -C ioncube \
+    && cp "$(find . -regex "./ioncube/ioncube_loader_lin_${PHP_VERSION}[0-9\.\_]*\(beta[0-9]*\|\)\.so")" \
+        "$(php -i | grep '^extension_dir =' | cut -d' ' -f3)/ioncube_loader.so" \
     && echo "zend_extension=ioncube_loader.so" > /etc/php.d/01-ioncube-loader.ini \
     && rm -rf /tmp/ioncube
 

diff --git a/version b/version
@@ -1 +1 @@
-0.4.2
+0.4.3
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		93e54cef-08b1-450d-882a-6a8e77ab44dc
		573d8cd2-196c-47f5-8b5d-8854152564d5