Browse Source

fixed debian/raspbian selection

tags/v1.3.0
Robin Thoni 5 years ago
parent
commit
32b64daf99
2 changed files with 6 additions and 2 deletions
  1. 3
    1
      frontend/Dockerfile
  2. 3
    1
      zabbix/Dockerfile

+ 3
- 1
frontend/Dockerfile View File

@@ -11,7 +11,9 @@ RUN apt-get update && apt-get -y install\
11 11
 
12 12
 ARG ZABBIX_VERSION=4.0
13 13
 
14
-RUN wget http://repo.zabbix.com/zabbix/${ZABBIX_VERSION}/$(grep -E '^ID=' /etc/os-release | cut -d= -f2)/pool/main/z/zabbix-release/zabbix-release_${ZABBIX_VERSION}-1+stretch_all.deb -O /tmp/zabbix.deb &&\
14
+RUN if [ "$(uname -m)" = "x86_64" ]; then echo -n "debian"; else echo -n "raspbian"; fi > /tmp/distrib &&\
15
+    wget http://repo.zabbix.com/zabbix/${ZABBIX_VERSION}/$(cat /tmp/distrib)/pool/main/z/zabbix-release/zabbix-release_${ZABBIX_VERSION}-1+stretch_all.deb -O /tmp/zabbix.deb &&\
16
+    rm /tmp/distrib &&\
15 17
     dpkg -i /tmp/zabbix.deb
16 18
 
17 19
 RUN apt-get update && apt-get -y install\

+ 3
- 1
zabbix/Dockerfile View File

@@ -10,7 +10,9 @@ ARG ZABBIX_VERSION=4.0
10 10
 
11 11
 RUN sed -i 's/main/main non-free/' /etc/apt/sources.list
12 12
 
13
-RUN wget http://repo.zabbix.com/zabbix/${ZABBIX_VERSION}/$(grep -E '^ID=' /etc/os-release | cut -d= -f2)/pool/main/z/zabbix-release/zabbix-release_${ZABBIX_VERSION}-1+stretch_all.deb -O /tmp/zabbix.deb &&\
13
+RUN if [ "$(uname -m)" = "x86_64" ]; then echo -n "debian"; else echo -n "raspbian"; fi > /tmp/distrib &&\
14
+    wget http://repo.zabbix.com/zabbix/${ZABBIX_VERSION}/$(cat /tmp/distrib)/pool/main/z/zabbix-release/zabbix-release_${ZABBIX_VERSION}-1+stretch_all.deb -O /tmp/zabbix.deb &&\
15
+    rm /tmp/distrib &&\
14 16
     dpkg -i /tmp/zabbix.deb
15 17
 
16 18
 RUN apt-get update && apt-get -y install\

Loading…
Cancel
Save