From 94f8312b3229edb1156cea5ca3e508a8ac2ec933 Mon Sep 17 00:00:00 2001 From: Kaiyuan Fan <172881969@qq.com> Date: Sat, 29 Aug 2020 00:38:46 -0400 Subject: [PATCH] new arm64 base (#2) --- .travis.yml | 10 ++++++---- README.md | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4cbd3ec..a36ba46 100755 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,8 @@ services: script: - export DOCKER_CLI_EXPERIMENTAL=enabled - source sha_functions.sh - - node_x86_sha=$(get_variant_sha "node" "alpine3.11" "amd64") +# - node_x86_sha=$(get_tag_sha "balenalib/amd64-alpine-node" "latest") + - node_x86_sha=$(get_tag_sha "amd64/node" "alpine3.12") - echo $node_x86_sha - treehouses_node_x86_sha=$(get_manifest_sha "treehouses/node" "amd64") - echo $treehouses_node_x86_sha @@ -17,7 +18,7 @@ script: - echo $node_arm_sha - treehouses_node_arm_sha=$(get_manifest_sha "treehouses/node" "arm") - echo $treehouses_node_arm_sha - - node_arm64_sha=$(get_variant_sha "node" "alpine3.11" "arm64") + - node_arm64_sha=$(get_tag_sha "balenalib/raspberrypi4-64-node" "latest") - echo $node_arm64_sha - treehouses_node_arm64_sha=$(get_manifest_sha "treehouses/node" "arm64") - echo $treehouses_node_arm64_sha @@ -25,9 +26,10 @@ script: - echo $flag - echo $DOCKERAPIKEY | docker login -u "sevenseas" --password-stdin before_deploy: - - tag="3.11-$(date +%Y%m%d%H%M)" + - tag="3.12-$(date +%Y%m%d%H%M)" - echo $tag - - create_manifests treehouses/node $tag "node@"$node_x86_sha "balenalib/raspberry-pi-alpine-node@"$node_arm_sha "node@"$node_arm64_sha +# - create_manifests treehouses/node $tag "balenalib/amd64-alpine-node@"$node_x86_sha "balenalib/raspberry-pi-alpine-node@"$node_arm_sha "balenalib/raspberrypi4-64-node@"$node_arm64_sha + - create_manifests treehouses/node $tag "amd64/node@"$node_x86_sha "balenalib/raspberry-pi-alpine-node@"$node_arm_sha "balenalib/raspberrypi4-64-node@"$node_arm64_sha - docker manifest inspect treehouses/node:latest - docker manifest inspect treehouses/node:$tag deploy: diff --git a/README.md b/README.md index f590327..7cae6ac 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # node -[Multiarch alpine image](https://hub.docker.com/r/treehouses/node) with Node.js based from [node](https://hub.docker.com/_/node) and [balena](https://hub.docker.com/r/balenalib/raspberry-pi-alpine-node) +[Multiarch alpine image](https://hub.docker.com/r/treehouses/node) with Node.js based from Node [amd64](https://hub.docker.com/r/amd64/node), balena [arm](https://hub.docker.com/r/balenalib/raspberry-pi-alpine-node), and [arm64](https://hub.docker.com/r/balenalib/raspberrypi4-64-node)