Merge pull request #360 from spira/feature/docker-structure-update

Feature/docker structure update

Dockerfile

@@ -1,22 +1,17 @@
-# run `docker build -t spira/spira:latest .` to build this container
+# run docker build -t spira/spira:latest -f ./docker/Dockerfile .
 
-FROM spira/docker-base
+FROM busybox:1.24.1
 
 MAINTAINER "Zak Henry" <zak.henry@gmail.com>
 
+# create data dir
 RUN mkdir -p /data
 
-# only add the required data code
-COPY api /data/api/
-COPY app/build /data/app/build
-COPY forum /data/forum
-
-# add vhosts for the nginx container
-COPY vhosts /data/vhosts/
-
-# make sure the logs directory exists
-RUN mkdir -p /data/logs
+# copy all files to data dir
+COPY . /data
 
+# allow data dir to be mounted as volue
 VOLUME /data
 
+# set the cwd
 WORKDIR /data

README.md

@@ -23,7 +23,6 @@ Lumen + AngularJS project seed with Docker
 * [Typescript](http://www.typescriptlang.org/)
 * [API Blueprint](https://apiblueprint.org/)
   * [Apiary](https://apiary.io/)
-  * [Drakov](https://github.com/Aconex/drakov)
   * [Snowcrash](https://github.com/apiaryio/snowcrash)
 * [Clarity](https://github.com/tobi/clarity)
 * [Mailcatcher](http://mailcatcher.me/)

app/src/app/guest/sandbox/sandbox.ts

@@ -61,7 +61,6 @@ namespace app.guest.sandbox {
         public callApi(apiEndpoint):void {
 
             this.ngRestAdapter
-                //.api('/api-mock')
                 .get(apiEndpoint)
                 .then((result) => {
                     this.$scope.apiResult = result;

app/src/common/services/user/userService.spec.ts

@@ -237,8 +237,7 @@ namespace common.services.user {
                 $httpBackend.expectPATCH('/api/users/' + user.userId,
                     (jsonData:string) => {
                         let data:{emailConfirmed:string} = JSON.parse(jsonData);
-                        // TSD only has definitions for moment 2.8.0 which does not contain function isBetween
-                        return data.emailConfirmed && (<any>moment)(data.emailConfirmed).isBetween(moment().subtract(1, 'second'), moment());
+                        return data.emailConfirmed && moment(data.emailConfirmed).isValid();
                     },
                     (headers) => {
                         return headers['email-confirm-token'] == emailToken;

docker-compose.yml

@@ -108,7 +108,6 @@ web:
     - php:php
     - logviewer:logviewer
     - mailcatcher:mailcatcher
-    - apimock:apimock
   volumes_from:
     - data
   env_file: ./docker/.local.env
@@ -127,14 +126,8 @@ devtools:
     - elasticsearch:elasticsearch
   volumes_from:
     - data
+  volumes:
+    - /cache:/cache
   env_file:
     - ./docker/.local.env
 
-apimock:
-  extends:
-    file: ./docker/common-services.yml
-    service: apimock
-  volumes_from:
-    - data
-  env_file:
-    - ./docker/.local.env

docker/.common.env

@@ -119,4 +119,9 @@ BEANSTALKD_HOST=queue
 # S3_KEY=null
 # S3_SECRET=null
 # S3_REGION=null
-# S3_BUCKET=null
+# S3_BUCKET=null
+
+#caching for build
+COMPOSER_HOME=/cache/composer
+bower_storage__packages=/cache/bower
+npm_config_cache=/cache/npm

docker/common-services.yml

@@ -59,12 +59,6 @@ devtools:
     - .common.env
     - .secret.env
 
-apimock:
-  image: spira/docker-drakov
-  env_file:
-    - .common.env
-
-
 elasticsearch:
   image: elasticsearch:1.7.1
   env_file:

docker/docker-compose.build.yml

@@ -0,0 +1,14 @@
+# Build configuration. This file is identical to the dev `docker-compose.yml` definition, except it exposes no ports to
+# allow multiple concurrent builds without concern of port collision
+devtools:
+  image: spira/docker-dev-tools
+  working_dir: /data
+  privileged: true
+  volumes:
+#    - /data:/data
+    - %build_directory%:/data
+    - %cache_directory%:/cache
+  env_file:
+    - .common.env
+    - .secret.env
+    - .qa.env