last test

.travis.yml

@@ -6,6 +6,10 @@ go:
   - "1.10"
 script:
   - go test -v
+addons:
+  apt:
+    packages:
+      - docker-ce
 deploy:
   - provider: script
     skip_cleanup: true
@@ -14,6 +18,8 @@ deploy:
       tags: true
       condition: $TRAVIS_OS_NAME = linux
   - provider: script
-    script: bash docker/docker_push
+    script:
+    - bash docker/push_images
+    - bash docker/push_manifest
     on:
       branch: master

docker/push_images

@@ -15,17 +15,4 @@ docker build -t $DOCKER_USERNAME/$IMAGE_NAME:armhf -f docker/Dockerfile.armhf .
 # x86 linux
 docker build -t $DOCKER_USERNAME/$IMAGE_NAME:latest -f docker/Dockerfile .
 
-docker push $DOCKER_USERNAME/$IMAGE_NAME
-
-# push manifest
-docker manifest create codeskyblue/gohttpserver \
-  codeskyblue/gohttpserver:latest \
-  codeskyblue/gohttpserver:armhf
-docker manifest annotate codeskyblue/gohttpserver:latest \
-  --os linux --arch amd64
-docker manifest annotate codeskyblue/gohttpserver:latest \
-  --os linux --arch arm --variant v7
-docker manifest push codeskyblue/gohttpserver
-
-# check again
-docker run mplatform/mquery codeskyblue/gohttpserver
+docker push $DOCKER_USERNAME/$IMAGE_NAME

docker/push_manifest

@@ -0,0 +1,23 @@
+#!/bin/bash
+#
+
+# push manifest
+if [[ ! -d $HOME/.docker ]]
+then
+    mkdir $HOME/.docker
+fi
+
+set -ex
+
+echo '{"experimental": "enabled"}' > $HOME/.docker/config.json
+docker manifest create codeskyblue/gohttpserver \
+  codeskyblue/gohttpserver:latest \
+  codeskyblue/gohttpserver:armhf
+docker manifest annotate codeskyblue/gohttpserver:latest \
+  --os linux --arch amd64
+docker manifest annotate codeskyblue/gohttpserver:latest \
+  --os linux --arch arm --variant v7
+docker manifest push codeskyblue/gohttpserver
+
+# check again
+docker run mplatform/mquery codeskyblue/gohttpserver