Merge remote-tracking branch 'origin/develop' for release 0.1.0-beta2

CHANGELOG.md

@@ -0,0 +1,10 @@
+0.1.0-beta2
+===============
+
+* Updated assertion to automatically execute "warden install" if installed metadata indicator is older than bin/warden
+* Fixed issue on Linux hosts where ssh_key.pub was unusable inside tunnel container due to bad permissions
+
+0.1.0-beta1
+===============
+
+* Initial beta release

README.md

@@ -4,7 +4,7 @@ Warden is a CLI utility for working with docker-compose environments, and enable
 ## Prerequisites
 
 * [Homebrew](https://brew.sh) package manager (for installing Warden)
-* [Docker for Mac](https://hub.docker.com/editions/community/docker-ce-desktop-mac) or [Docker for Linux](https://docs.docker.com/install/linux/docker-ce/fedora/)
+* [Docker for Mac](https://hub.docker.com/editions/community/docker-ce-desktop-mac) or [Docker for Linux](https://docs.docker.com/install/linux/docker-ce/fedora/) (currently tested on Fedora 29)
 * `docker-compose` available in your `$PATH` (included in Docker for Mac, can be installed via brew on Linux hosts)
 
 ## Installing Warden

bin/warden

@@ -53,8 +53,14 @@ while (( "$#" )); do
 done
 
 function assert_installed {
-  if [[ ! -f "${WARDEN_HOME_DIR}/.installed" ]]; then
+  if [[ ! -f "${WARDEN_HOME_DIR}/.installed" ]] \
+    || [[ "${WARDEN_HOME_DIR}/.installed" -ot "${WARDEN_DIR}/bin/warden" ]]
+  then
+    [[ -f "${WARDEN_HOME_DIR}/.installed" ]] && echo "==> Updating warden" || echo "==> Starting initialization"
+
     "${WARDEN_DIR}/bin/warden" install
+
+    [[ -f "${WARDEN_HOME_DIR}/.installed" ]] && echo "==> Update complete" || echo "==> Initialization complete"
     date > "${WARDEN_HOME_DIR}/.installed"
   fi
 }

commands/install.cmd

@@ -53,6 +53,11 @@ if [[ ! -f "${WARDEN_HOME_DIR}/tunnel/ssh_key" ]]; then
   ssh-keygen -b 2048 -t rsa -f "${WARDEN_HOME_DIR}/tunnel/ssh_key" -N "" -C "[email protected]"
 fi
 
+## since bind mounts are native on linux to use .pub file as authorized_keys file in tunnel it must have proper perms
+if [[ "$OSTYPE" == "linux-gnu" ]] && [[ "$(stat -c '%U' "${WARDEN_HOME_DIR}/tunnel/ssh_key.pub")" != "root" ]]; then
+  sudo chown root:root "${WARDEN_HOME_DIR}/tunnel/ssh_key.pub"
+fi
+
 if ! grep '## WARDEN START ##' /etc/ssh/ssh_config >/dev/null; then
   echo "==> Configuring sshd tunnel in host ssh_config (requires sudo privileges)"
   cat <<-EOF | sudo tee -a /etc/ssh/ssh_config >/dev/null
@@ -66,5 +71,3 @@ if ! grep '## WARDEN START ##' /etc/ssh/ssh_config >/dev/null; then
 		## WARDEN END ##
 		EOF
 fi
-
-echo "==> Installed successfully"

commands/restart.cmd

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 [[ ! ${WARDEN_COMMAND} ]] && >&2 echo -e "\033[31mThis script is not intended to be run directly!" && exit 1
 
+## ensure warden install has been run
+assert_installed
+
 pushd "${WARDEN_DIR}" >/dev/null
-docker-compose -p warden -f docker/docker-compose.yml restart "${WARDEN_PARAMS[@]}" "$@"
+docker-compose -p warden -f docker/docker-compose.yml restart "${WARDEN_PARAMS[@]}" "$@"

commands/sign-certificate.cmd

@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 [[ ! ${WARDEN_COMMAND} ]] && >&2 echo -e "\033[31mThis script is not intended to be run directly!" && exit 1
 
+## ensure warden install has been run
+assert_installed
+
 mkdir -p "${WARDEN_SSL_DIR}/certs"
 
 if [[ ! -f "${WARDEN_SSL_DIR}/rootca/certs/ca.cert.pem" ]]; then

commands/start.cmd

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 [[ ! ${WARDEN_COMMAND} ]] && >&2 echo -e "\033[31mThis script is not intended to be run directly!" && exit 1
 
+## ensure warden install has been run
+assert_installed
+
 pushd "${WARDEN_DIR}" >/dev/null
 docker-compose -p warden -f docker/docker-compose.yml start "${WARDEN_PARAMS[@]}" "$@"

commands/up.cmd

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 [[ ! ${WARDEN_COMMAND} ]] && >&2 echo -e "\033[31mThis script is not intended to be run directly!" && exit 1
 
+## ensure warden install has been run
 assert_installed
 
 mkdir -p "${WARDEN_HOME_DIR}/etc/traefik"

commands/usage.help

@@ -11,7 +11,7 @@ WARDEN_HEADER='
 
 WARDEN_USAGE=$(cat <<EOF
 ${WARDEN_HEADER:1}
-Warden version 0.1.0-dev
+Warden version 0.1.0-beta2
 
 \033[33mUsage:\033[0m
   command [options] [arguments]
@@ -22,7 +22,7 @@ Warden version 0.1.0-dev
 
 \033[33mCommands:\033[0m
   down              Stop and remove containers, networks, and services
-  install           Installs local docker environment in the current directory
+  install           Initializes or updates warden configuration on host machine
   restart           Restarts warden managed containers
   sign-certificate  Signs a wildcard certificate including all passed hostnames on the SAN list
   start             Start services