improve docker build

environments/cutlergyor/apache2/Dockerfile

@@ -58,8 +58,20 @@ EXPOSE 80
 # Default command
 CMD ["apachectl", "-D", "FOREGROUND"]
 
+ENV FITNESS_DB_HOST="" \
+FITNESS_DB_NAME="" \
+FITNESS_DB_PORT="" \
+FITNESS_DB_USERNAME="" \
+FITNESS_DB_PASSWORD="" \
+FITNESS_MAIL_HOST="" \
+FITNESS_MAIL_PORT="" \
+FITNESS_MAIL_USERNAME="" \
+FITNESS_MAIL_PASSWORD=""
+
+ADD data/cutlerimagevendor.tar.gz /data/
 ADD data/cutlerimagecontent.tar.gz /var/www/html/
 RUN mv /var/www/html/fitness_web /var/www/html/cutler
+RUN ln -sf /data/vendor /var/www/html/cutler/vendor
 ADD config /config
 #overwrite configs
 RUN find /config/common/ -maxdepth 2 -type f  -name '*-local.php'  -exec cp {} /var/www/html/cutler/common/config/ \; \
@@ -70,12 +82,3 @@ RUN find /config/common/ -maxdepth 2 -type f  -name '*-local.php'  -exec cp {} /
     && find /config/rest/ -maxdepth 2 -type f  -name '*-local.php'  -exec cp {} /var/www/html/cutler/rest/config/ \;
 
 
-ENV FITNESS_DB_HOST ""
-ENV FITNESS_DB_NAME ""
-ENV FITNESS_DB_PORT ""
-ENV FITNESS_DB_USERNAME ""
-ENV FITNESS_DB_PASSWORD ""
-ENV FITNESS_MAIL_HOST ""
-ENV FITNESS_MAIL_PORT ""
-ENV FITNESS_MAIL_USERNAME ""
-ENV FITNESS_MAIL_PASSWORD ""

environments/cutlergyor/apache2/create-image.sh

@@ -6,7 +6,6 @@ DATA_DIR="$START_DIR/data"
 mkdir -p $DATA_DIR
 echo "DATA_DIR $DATA_DIR"
 
-
 PROJECT_DIR=$(readlink -f "$START_DIR/../../..")
 echo "PROJECT_DIR $PROJECT_DIR"
 
@@ -16,18 +15,32 @@ echo "PROJECT_DIRNAME $PROJECT_DIRNAME"
 PROJECT_PARENT_DIR=$(readlink -f "$PROJECT_DIR/..")
 echo "PROJECT_PARENT_DIR $PROJECT_PARENT_DIR"
 
+PROJECT_VENDOR_DIRNAME="vendor"
+PROJECT_VENDOR_DIR=$(readlink -f "$PROJECT_DIR""/""$PROJECT_VENDOR_DIRNAME")
+echo "PROJECT_VENDOR_DIR $PROJECT_VENDOR_DIR"
+
 VERSION=$(cat "$PROJECT_DIR/package.json" | jq -r .version)
 echo "VERSION $VERSION"
 
 
 TMP_DIR="/tmp"
 
-ARCHIVE_FILE=$TMP_DIR"/cutlerimagecontent.tar.gz"
+ARCHIVE_FILE_APP=$TMP_DIR"/cutlerimagecontent.tar.gz"
+ARCHIVE_FILE_VENDOR=$TMP_DIR"/cutlerimagevendor.tar.gz"
+
+rm -f "$ARCHIVE_FILE_APP"
+rm -f "$ARCHIVE_FILE_VENDOR"
+cd "$PROJECT_DIR" || exit 1
+echo archiving vendor
+tar -czf $ARCHIVE_FILE_VENDOR \
+    "$PROJECT_VENDOR_DIRNAME"
+
+echo "copy vendor archive into docker context"
+cp "$ARCHIVE_FILE_VENDOR" "$DATA_DIR"
 
-rm -f $ARCHIVE_FILE
 cd "$PROJECT_PARENT_DIR" || exit 1
 echo "archiving project into tar"
-tar -czf $ARCHIVE_FILE \
+tar -czf $ARCHIVE_FILE_APP \
   --exclude "node_modules" \
   --exclude ".git" \
   --exclude ".idea" \
@@ -35,10 +48,13 @@ tar -czf $ARCHIVE_FILE \
   --exclude "docker" \
   --exclude "doc" \
   --exclude "test" \
+  --exclude "vendor" \
+  --exclude='*.log' \
+  --exclude='fitness_web/environments/cutlergyor/apache2/data' \
   "$PROJECT_DIRNAME"
 
 echo "copy archive into docker context"
-cp "$ARCHIVE_FILE" "$DATA_DIR"
+cp "$ARCHIVE_FILE_APP" "$DATA_DIR"
 
 echo "building image"
 cd "$START_DIR"

package.json

@@ -7,7 +7,7 @@
     "cache-manager": "^3.3.0"
   },
   "devDependencies": {
-    "grunt": "~0.4.1",
+    "grunt": "1.5.3",
     "matchdep": "*",
 
     "grunt-contrib-coffee": "*",