dockerfiles cleanup

Author: luckyj5

codeship/Dockerfile.build

@@ -27,14 +27,12 @@ RUN \
     docker-ce \
     gcc \
     git \
-    jq \
     nodejs \
     npm \
     python3 \
     python3-dev \
     python3-pip \
-    psmisc \
-    vim && \
+    psmisc && \
   apt-get autoclean && \
   apt-get clean && \
   \
@@ -52,10 +50,9 @@ WORKDIR /go/src/github.com/splunk/docker-logging-plugin/
 
 COPY . /go/src/github.com/splunk/docker-logging-plugin/
 
-# install dep
+# install go dep
 RUN curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-
 RUN cd /go/src/github.com/splunk/docker-logging-plugin && dep ensure
 
-
+#Build plugin
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /go/src/github.com/splunk/docker-logging-plugin/splunk-logging-plugin/rootfs/bin/splunk-logging-plugin .

codeship/Dockerfile.splunk

@@ -76,7 +76,7 @@ COPY ./splunk/inputs.conf ./etc/apps/splunk_httpinput/local/inputs.conf
 RUN mkdir -p ./etc/system/local
 COPY ./splunk/server.conf /opt/splunk/etc/system/local/server.conf
 
-HEALTHCHECK --interval=10s --timeout=120s --start-period=20s --retries=10 \
+HEALTHCHECK --interval=10s --timeout=60s --start-period=20s --retries=10 \
   CMD curl -ksSL "https://localhost:8088/services/collector/health" || exit 1
 
 ENTRYPOINT ["./bin/splunk"]