Merge pull request #61 from JarvusInnovations/develop

Release: emergence v1.0.5

Dockerfile

@@ -0,0 +1,83 @@
+FROM ubuntu:16.04
+
+# initialize .ssh directory
+RUN mkdir -p ~/.ssh \
+    && chmod 700 ~/.ssh \
+    && touch ~/.ssh/authorized_keys \
+    && chmod 600 ~/.ssh/authorized_keys
+
+
+# intsall Ubuntu packages
+RUN export DEBIAN_FRONTEND=noninteractive \
+    && export LC_ALL=en_US.UTF-8 \
+    && apt-get update \
+    && apt-get install -y --allow-unauthenticated \
+        apt-utils \
+        curl \
+        g++ \
+        gettext \
+        git \
+        imagemagick \
+        language-pack-en-base \
+        make \
+        mysql-client \
+        mysql-server \
+        nginx \
+        nodejs \
+        nodejs-legacy \
+        npm \
+        openssh-server \
+        postfix \
+        python \
+        python-software-properties \
+        ruby-compass \
+        ruby-dev \
+        screen \
+        software-properties-common \
+        sudo \
+        tmux \
+        vim \
+    && add-apt-repository -y ppa:ondrej/php \
+    && apt-get update \
+    && apt-get install -y --allow-unauthenticated --no-install-recommends \
+        php-apcu \
+        php5.6-cli \
+        php5.6-curl \
+        php5.6-fpm \
+        php5.6-gd \
+        php5.6-imagick \
+        php5.6-intl \
+        php5.6-json \
+        php5.6-mbstring \
+        php5.6-mysql \
+        php5.6-xml \
+    && rm -rf /var/lib/apt/lists/*
+
+
+# disable built-in services for emergence
+RUN service nginx stop \
+    && service php5.6-fpm stop \
+    && service mysql stop \
+    && service apparmor stop \
+    && update-rc.d -f nginx disable \
+    && update-rc.d -f php5.6-fpm disable \
+    && update-rc.d -f mysql disable \
+    && update-rc.d -f apparmor disable
+
+
+# install Habitat client and packages for emergence
+RUN curl -s https://raw.githubusercontent.com/habitat-sh/habitat/master/components/hab/install.sh | sudo bash
+RUN hab pkg install jarvus/sencha-cmd/5.1.3.61/20170606195324 jarvus/underscore \
+    && hab pkg binlink jarvus/sencha-cmd sencha \
+    && hab pkg binlink jarvus/underscore underscore
+
+
+# install emergence
+RUN npm install -g emergence
+
+
+# setup and expose emergence
+RUN mkdir -p /emergence
+EXPOSE 22 80 3306 9083
+VOLUME ["/emergence"]
+CMD ["emergence-kernel"]

package.json

@@ -1,7 +1,7 @@
 {
   "name": "emergence",
   "preferGlobal": true,
-  "version": "1.0.3",
+  "version": "1.0.5",
   "license": "MIT",
   "dependencies": {
     "hostile": "^1.0.2",

php-bootstrap/lib/Site.class.php

@@ -83,6 +83,8 @@ public static function initialize($rootPath, $hostname = null)
                 $path = substr($path, 0, $qPos);
             }
 
+            $path = urldecode($path);
+
             static::$pathStack = static::$requestPath = static::splitPath($path);
         }
 

run-dev-container

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+docker run -d \
+    -it \
+    --name emergence \
+    -v /emergence:/emergence \
+    -p 127.0.0.10:80:80 \
+    -p 127.0.0.10:3306:3306 \
+    -p 127.0.0.10:9083:9083 \
+    jarvus/emergence \
+    tmux new -s emergence emergence-kernel