From 2f6cb2d2adcb981e441876cb2c91972f34c6b952 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Wed, 29 Jan 2020 11:25:38 +0200 Subject: [PATCH] chore(travis) deploy --- .madrun.js | 18 ++++++++++++++---- .travis.yml | 4 ++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.madrun.js b/.madrun.js index 6cb391c9..422b1e5c 100644 --- a/.madrun.js +++ b/.madrun.js @@ -56,7 +56,7 @@ module.exports = { 'test:server': () => `tape 'test/**/*.js' 'server/**/*.spec.js' 'common/**/*.spec.js'`, 'wisdom': () => run(['lint:all', 'build', 'test']), 'wisdom:type': () => 'bin/release.js', - 'docker:pull:node': () => 'docker pull node', + 'docker:pull': () => 'docker pull node', 'docker:pull:alpine': () => 'docker pull mhart/alpine-node', 'docker:pull:arm32': () => 'docker pull arm32v7/node:slim', 'docker:pull:arm64': () => 'docker pull arm64v8/node:slim', @@ -76,17 +76,25 @@ module.exports = { const images = [ `${dockerName}:latest`, `${dockerName}:latest-x64`, - `${dockerName}:latest-arm32`, - `${dockerName}:latest-arm64`, + // `${dockerName}:latest-arm32`, + // `${dockerName}:latest-arm64`, ].join(' '); return `docker manifest create ${images}`; }, 'docker:manifest:push': () => `docker manifest push ${dockerName}:latest`, - 'docker': () => run(['docker:pull*', 'docker:build*', 'docker:tag*', 'docker:push*']), + 'docker': () => run(['docker:x64', 'docker:alpine', 'docker:manifest:*']), 'docker-ci': () => run(['build', 'docker-login', 'docker']), 'docker-login': () => 'docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD', + 'docker:x64': () => run([ + 'docker:pull', + 'docker:build', + 'docker:tag', + 'docker:push', + 'docker:push:latest', + ]), + 'docker:alpine': () => run([ 'docker:pull:alpine', 'docker:build:alpine', @@ -95,6 +103,7 @@ module.exports = { 'docker:push:alpine:latest', ]), + /* 'docker:arm32': () => run([ 'docker:pull:arm32', 'docker:build:arm32', @@ -110,6 +119,7 @@ module.exports = { 'docker:push:arm64', 'docker:push:arm64:latest', ]), + */ 'docker:manifest': () => run([ 'docker:manifest:create', diff --git a/.travis.yml b/.travis.yml index 7e45964a..1b557301 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ services: before_deploy: - echo '{"experimental":"enabled"}' | sudo tee /etc/docker/daemon.json - mkdir -p $HOME/.docker - - echo '{"experimental":"enabled"}' | sudo tee $HOME/.docker/config.json + - echo '{"experimental":"enabled"}' | tee $HOME/.docker/config.json - sudo service docker start deploy: @@ -46,7 +46,7 @@ deploy: script: npm run docker-ci skip_cleanup: true on: - node: "10" + node: 12 condition: $TRAVIS_OS_NAME = linux tags: true all_branches: false