Merge pull request #87 from zabbix/master

dotneft · web-flow · commit e7e26e851cf2 · 2017-03-12T03:15:03.000+05:00
Replace Alpine 3.5 to 3.4 version
diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:latest
+FROM alpine:3.4
 MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
 
 ARG APK_FLAGS_COMMON="-q"
diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:latest
+FROM alpine:3.4
 MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
 
 ARG APK_FLAGS_COMMON="-q"
diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:latest
+FROM alpine:3.4
 MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
 
 ARG APK_FLAGS_COMMON="-q"
diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:latest
+FROM alpine:3.4
 MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
 
 ARG APK_FLAGS_COMMON="-q"
diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:latest
+FROM alpine:3.4
 MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
 
 ARG APK_FLAGS_COMMON="-q"
diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:latest
+FROM alpine:3.4
 MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
 
 ARG APK_FLAGS_COMMON="-q"
diff --git a/web-apache-mysql/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:latest
+FROM alpine:3.4
 MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
 
 ARG APK_FLAGS_COMMON="-q"
diff --git a/web-apache-pgsql/alpine/Dockerfile b/web-apache-pgsql/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:latest
+FROM alpine:3.4
 MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
 
 ARG APK_FLAGS_COMMON="-q"
diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:latest
+FROM alpine:3.4
 MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
 
 ARG APK_FLAGS_COMMON="-q"
diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:latest
+FROM alpine:3.4
 MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
 
 ARG APK_FLAGS_COMMON="-q"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM alpine:latest`
	`1`	`+FROM alpine:3.4`
`2`	`2`	`MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>`
`3`	`3`
`4`	`4`	`ARG APK_FLAGS_COMMON="-q"`