Bump alpine to 3.10 and other docker improvements.

lukyjay · Sep 29, 2019 · a7e9ad7 · a7e9ad7
1 parent 61e2087
commit a7e9ad7
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 9 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,7 +1,15 @@
-node_modules
-.travis*
+.eslintignore
+.eslintrc.json
 .git
+.github
 .gitignore
-*.png
-firmware
-docker/Dockerfile*
+.npmrc
+.travis*
+.travis.yml
+README.md
+docker/Dockerfile*
+images
+node_modules
+scripts
+test
+update.sh
diff --git a/.travis/docker.sh b/.travis/docker.sh
@@ -15,7 +15,7 @@ build_and_push() {
 }
 
 push_manifest() {
-  export DOCKER_CLI_EXPERIMENTAL=enabled  
+  export DOCKER_CLI_EXPERIMENTAL=enabled
 
   docker manifest create $DOCKER_USERNAME/zigbee2mqtt:latest$1 $DOCKER_USERNAME/zigbee2mqtt:latest$1 $DOCKER_USERNAME/zigbee2mqtt:arm32v6$1 $DOCKER_USERNAME/zigbee2mqtt:arm64v8$1
 

diff --git a/docker/Dockerfile.amd64 b/docker/Dockerfile.amd64
@@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM alpine:3.10
 
 # Copy files
 ADD . /app

diff --git a/docker/Dockerfile.arm32v6 b/docker/Dockerfile.arm32v6
@@ -1,4 +1,4 @@
-FROM arm32v6/alpine:3.9
+FROM arm32v6/alpine:3.10
 
 # Setup cross-build
 ENV QEMU_EXECVE 1

diff --git a/docker/Dockerfile.arm64v8 b/docker/Dockerfile.arm64v8
@@ -1,4 +1,4 @@
-FROM arm64v8/alpine:3.9
+FROM arm64v8/alpine:3.10
 
 # Setup cross-build
 ENV QEMU_EXECVE 1

diff --git a/docker/qemu-aarch64-static b/docker/qemu-aarch64-static
diff --git a/docker/qemu-arm-static b/docker/qemu-arm-static