From 82fa1026bd3d2206c379f25240b195da368d95b7 Mon Sep 17 00:00:00 2001
From: charleszlu <c4planted@gmail.com>
Date: Sat, 1 Jun 2019 07:33:09 +1000
Subject: Consolidated build

removed tzdata
---
 Dockerfile                | 29 ++++++++++++++---------------
 userparameter_murmur.conf |  2 +-
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7fcdaad..b11bdf8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,29 +6,28 @@ ARG ICE_VERSION=3.7.2
 
 RUN apk add --no-cache \
     libstdc++ \
-    openssl-dev \
-	openssh \
-	bash \
-	tzdata && \
-	apk add --no-cache --virtual .build-deps \
+    openssh \
+    bash && \
+    apk add --no-cache --virtual .build-deps \
     bzip2-dev \
+    openssl-dev \
     g++ && \
-	pip install --no-cache-dir --global-option=build_ext --global-option="-D__USE_UNIX98" zeroc-ice==${ICE_VERSION} && \
-	apk del .build-deps && \
-	find /usr/local -depth \
-       \( \
-         \( -type d -a \( -name test -o -name tests \) \) \
-         -o \
-         \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
-       \) -exec rm -rf '{}' +;
+    pip install --no-cache-dir --global-option=build_ext --global-option="-D__USE_UNIX98" zeroc-ice==${ICE_VERSION} && \
+    apk del .build-deps && \
+    find /usr/local -depth \
+        \( \
+          \( -type d -a \( -name test -o -name tests \) \) \
+          -o \
+          \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
+        \) -exec rm -rf '{}' +;
 
 COPY entrypoint.sh /entrypoint.sh
 COPY Murmur.ice /murmur-info/Murmur.ice
 COPY murmur-info.py /murmur-info/murmur-info.py
 
 RUN chmod +x /entrypoint.sh \
-	&& mkdir -p /root/.ssh \
-	&& rm -rf /var/cache/apk/* /tmp/*
+    && mkdir -p /root/.ssh \
+    && rm -rf /var/cache/apk/* /tmp/*
 
 ENV ROOT_PASSWORD root
 ENV KEYPAIR_LOGIN false
diff --git a/userparameter_murmur.conf b/userparameter_murmur.conf
index d455dc4..4075641 100755
--- a/userparameter_murmur.conf
+++ b/userparameter_murmur.conf
@@ -1,2 +1,2 @@
 # Zabbix agent custom keys
-UserParameter=murmur.value[*],/home/charles/murmur/murmur-info/murmur-munin.py $1 $2
\ No newline at end of file
+UserParameter=murmur.value[*],/home/charles/murmur/murmur-info/murmur-munin.py $1 $2
-- 
cgit v1.2.3