updated readme

Author: adrian7

README.md

@@ -12,23 +12,17 @@ Options:
  - `--env` builds the image 
 with configuration stored in config-{env} folder
  - `--php` selects php version (builds from the {version}-fpm-alpine base).
+ - `--customize folder` the name of the folder under `custom` to build from the resulting image. By default all folders under custom will be built.
+
+The script will automatically build your custom images by placing your Dockerfiles in the `custom` folder. Your image will have the name of the folder it is placed in, tagged with latest. E.g. for the example folder the image will be built as `example:latest`.
 
 Example:
 
-`./build.sh devimage:latest --env dev --php 7.1.8`
+`./build.sh phpdevbase:latest --env dev --php 7.1.8 --customize phpdev`
 
 Then you can start your container with the built image: 
 
-`docker run -d -p 31287:80 --name dev-container devimage:latest`
-
-Or base your images on it (Dockerfile):
-
-    FROM devimage:latest
-    
-    ENV SERVER_ROOT /var/www/public
-    ENV APP_ENV dev
-    
-    EXPOSE 80
+`docker run -d -p 31287:80 --name dev-container phpdev:latest`
 
 Available PHP versions:
 

build.sh

@@ -39,6 +39,9 @@ optional arguments:
  --help             displays this help message
  --env environment  use config-{env} configuration
  --php version      set php version / base image
+ --customize folder the folder under ./custom to build from the resulting image; 
+
+By default the script will build all folders in ./custom 
 
 EOM
 
@@ -62,24 +65,28 @@ success() {
 for arg in "$@"; do
   shift
   case "$arg" in
-    "--help") set -- "$@" "-h" ;;
-    "--env")  set -- "$@" "-e" ;;
-    "--php")  set -- "$@" "-p" ;;
-    *)        set -- "$@" "$arg"
+    "--help") 		set -- "$@" "-h" ;;
+    "--env")  		set -- "$@" "-e" ;;
+    "--php")  		set -- "$@" "-p" ;;
+	"--customize")  set -- "$@" "-c" ;;
+    *)        		set -- "$@" "$arg"
   esac
 done
 
 shift
 
 # Parse short options
-while getopts "e:p:" o; do
+while getopts "e:p:c:" o; do
     case "${o}" in
         e)
             e=${OPTARG}
             ;;
         p)
             p=${OPTARG}
 			;;
+        c)
+            c=${OPTARG}
+			;;	
         *)
             usage
             ;;
@@ -90,6 +97,7 @@ shift $((OPTIND-1))
 
 CONFIG_DIR=$e
 CONFIG_VER=$p
+CUSTOMIZE=$c
 
 #Init defaults
 if 
@@ -136,7 +144,11 @@ if [ -d "$PWD/custom" ]; then
 
 	for i in * ; do
 
-		if [ -d "$i" ] && [ -f "${BUILD_DIR}/${i}/Dockerfile" ]; then 
+		if [ ! -z "$CUSTOMIZE" ] && [ "$i" != "$CUSTOMIZE" ]; then
+			continue
+		fi
+		
+		if [ -d "$i" ] && [ -f "${BUILD_DIR}/${i}/Dockerfile" ]; then  
 
 			DOCKERFILE_PATH="${BUILD_DIR}/${i}/Dockerfile"
 	    	info "Building custom image $i:latest ..."
@@ -146,7 +158,9 @@ if [ -d "$PWD/custom" ]; then
 				--build-arg BUILD_FROM="${BUILDNAME}" \
 				"$BUILD_DIR/$i"
 
-	  	fi
+		else 
+			warning "Folder ${i} can't be built. Dockerfile missing!"
+		fi	
 
 	done
 

custom/.gitignore

@@ -1 +1,2 @@
+*
 !example

custom/example/Dockerfile

@@ -6,11 +6,11 @@ FROM $BUILD_FROM
 #Start your customizations here
 
 #Example 
-#
-#PostregSQL and zip suppoer
-#RUN set -ex \
-#	&& apk --no-cache add postgresql-dev \
-#	&& docker-php-ext-install pdo pdo_pgsql zip
+
+#PostregSQL and zip support
+RUN set -ex \
+	&& apk --no-cache add postgresql-dev \
+	&& docker-php-ext-install pdo pdo_pgsql zip
 
 #Expose port 80
-#EXPOSE 80
+EXPOSE 80