updated base-image & help

.gitlab-ci.yml

@@ -13,9 +13,10 @@ test:
   stage: test
   script:
     - docker-compose run --rm roj
-    # TODO: add test for docker version
-    - docker-compose run --rm roj help.sh
+    - docker-compose run --rm roj pwd
+    - docker-compose run --rm roj docker version
     - docker-compose run --rm roj docker-machine ls
+    - docker-compose run --rm roj help.sh
     - docker-compose run --rm roj boilr
 cleanup:
   stage: cleanup

Dockerfile

@@ -1,4 +1,4 @@
-FROM schmunk42/docker-toolbox:5.0.2
+FROM schmunk42/docker-toolbox:5.0.3
 
 # Install system packages
 ENV TERM linux
@@ -9,26 +9,26 @@ RUN apt-get update && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
+
 # Install boilr
 RUN curl -sSL https://raw.githubusercontent.com/tmrts/boilr/master/install | bash
 ENV PATH /root/bin:${PATH}
 RUN boilr init
 
-RUN mkdir /roj
-WORKDIR /roj
 
+# Add scripts and configuration
 ENV PATH="/roj/bin:${PATH}"
 ENV MACHINE_STORAGE_PATH /roj/config/machine
 ENV DOCKER_CONFIG /roj/config
 
-RUN rm /opt/local/bin/docker
-RUN ln -s /opt/local/bin/docker-1.12.3 /opt/local/bin/docker
-
 COPY ./src /
 
+RUN mkdir /roj
+WORKDIR /roj
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
 CMD bash
 
+
 # Experimental(!) - Currently not available from DockerHub builds (TODO)
 ARG BUILD_ROJ_VERSION
 ENV ROJ_VERSION=${BUILD_ROJ_VERSION}

src/usr/local/bin/help.sh

@@ -8,6 +8,7 @@ Commands:
   docker-machine
   docker
   docker-compose
+  boilr
 
 Examples:
   docker-machine -h         Show machine help
@@ -18,5 +19,6 @@ Examples:
   docker ps -a              Show all containers
   docker -h                 Show docker-compose help
   docker-compose ps         Show running container from current stack directory
+  boilr template list       Show available templates
 
 EOT