diff options
author | charleszlu <c4planted@gmail.com> | 2019-06-01 00:33:09 +0300 |
---|---|---|
committer | charleszlu <c4planted@gmail.com> | 2019-06-01 00:33:09 +0300 |
commit | 82fa1026bd3d2206c379f25240b195da368d95b7 (patch) | |
tree | 4cdf916c60affa52a7515aae4ed9d0664e06e63f | |
parent | ecea35f308a9c8019041b6678d37e019e1de1094 (diff) |
removed tzdata
-rw-r--r-- | Dockerfile | 29 | ||||
-rwxr-xr-x | userparameter_murmur.conf | 2 |
2 files changed, 15 insertions, 16 deletions
@@ -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 |