Merge pull request #6 from bryanlatten/feature-goss

Dockerfile: Added goss

.travis.yml

@@ -5,3 +5,4 @@ services:
 
 script:
 - docker build .
+- docker build -f Dockerfile-alpine .

Dockerfile

@@ -8,11 +8,20 @@ ENV SIGNAL_BUILD_STOP=99 \
     S6_KILL_FINISH_MAXTIME=5000 \
     S6_KILL_GRACETIME=3000
 
-# Slim the container from its pre-installed heft
-RUN apt-get autoclean -y && \
+# Upgrade base packages, then clean packaging leftover
+RUN apt-get update && \
+    apt-get upgrade -yqq && \
+    apt-get install -yqq \
+      curl \
+    && \
+    # Add goss for local testing
+    curl -L https://github.com/aelsabbahy/goss/releases/download/v0.2.3/goss-linux-amd64 -o /usr/local/bin/goss && \
+    chmod +x /usr/local/bin/goss && \
+    apt-get remove --purge -yq curl && \
+    apt-get autoclean -y && \
     apt-get autoremove -y && \
     rm -rf /var/lib/{cache,log}/ && \
-    rm -rf /var/lib/apt/lists/ && \
+    rm -rf /var/lib/apt/lists/* && \
     rm -rf /tmp/* /var/tmp/*
 
 # Overlay the root filesystem from this repo
@@ -22,6 +31,8 @@ COPY ./container/root /
 RUN tar xzf /tmp/s6-overlay-amd64.tar.gz -C / && \
     rm /tmp/s6-overlay-amd64.tar.gz
 
+RUN goss -g goss.base.yaml validate
+
 # NOTE: intentionally NOT using s6 init as the entrypoint
 # This would prevent container debugging if any of those service crash
 CMD ["/bin/bash", "/run.sh"]

Dockerfile-alpine

@@ -14,7 +14,11 @@ RUN echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/r
         sed \
         bash \
         grep \
+        curl \
     && \
+    curl -L https://github.com/aelsabbahy/goss/releases/download/v0.2.3/goss-linux-amd64 -o /usr/local/bin/goss && \
+    chmod +x /usr/local/bin/goss && \
+    apk del curl && \
     rm -rf /var/cache/apk/*
 
 # Overlay the root filesystem from this repo
@@ -24,6 +28,8 @@ COPY ./container/root /
 RUN tar xzf /tmp/s6-overlay-amd64.tar.gz -C / && \
     rm /tmp/s6-overlay-amd64.tar.gz
 
+RUN goss -g goss.base.yaml validate
+
 # NOTE: intentionally NOT using s6 init as the entrypoint
 # This would prevent container debugging if any of those service crash
 CMD ["/bin/bash", "/run.sh"]

README.md

@@ -23,6 +23,12 @@ To inject changes just before runtime, shell scripts may be placed into the
 `/etc/cont-init.d` folder.
 As part of the process manager, these scripts are run in advance of the supervised processes. @see https://github.com/just-containers/s6-overlay#executing-initialization-andor-finalization-tasks
 
+### Testing
+
+Container tests itself as part of build process using [goss](https://github.com/aelsabbahy/goss) validator. 
+To add additional tests, overwrite (or extend) the `/goss.base.yaml` file.  
+
+
 
 ### Advanced Modification
 

container/root/goss.base.yaml

@@ -0,0 +1,6 @@
+command:
+  # Use a built-in S6 command to ensure it was installed
+  s6-true:
+    exit-status: 0
+    stderr: []
+    stdout: []