From b955818e400ae47510ef03a2a60489dab52bdabb Mon Sep 17 00:00:00 2001 From: Ayane Satomi Date: Wed, 8 Jan 2020 21:05:50 +0800 Subject: [PATCH 01/10] ci: add Drone script Signed-off-by: Ayane Satomi --- .drone.yml | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 000000000000..eb07c737a042 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,103 @@ +kind: pipeline +type: docker +name: build-amd64 + +platform: + arch: amd64 + +steps: + + - name: build + image: node:12 + commands: + - apt update && apt install -y build-essential git libsecret-1-dev libx11-dev libxkbfile-dev + - yarn + - if [ ! -n $DRONE_TAG ]; then yarn build 1.41.1 daily; else yarn build 1.41.1 $DRONE_TAG; fi + - if [ ! -n $DRONE_TAG ]; then yarn binary 1.41.1 daily; else yarn binary 1.41.1 $DRONE_TAG; fi + + - name: build-alpine + image: node:12-alpine + commands: + - apk add libxkbfile-dev libsecret-dev build-base git + - yarn + - if [ ! -n $DRONE_TAG ]; then yarn build 1.41.1 daily; else yarn build 1.41.1 $DRONE_TAG; fi + - if [ ! -n $DRONE_TAG ]; then yarn binary 1.41.1 daily; else yarn binary 1.41.1 $DRONE_TAG; fi + + - name: publish + image: plugins/github-release + settings: + api_key: + from_secret: gh-token + files: '*.tar.gz' + when: + event: tag + +--- +kind: pipeline +type: docker +name: build-arm64 + +platform: + arch: arm64 + +steps: + + - name: build + image: node:12 + commands: + - apt update && apt install -y build-essential git libsecret-1-dev libx11-dev libxkbfile-dev + - yarn + - if [ ! -n $DRONE_TAG ]; then yarn build 1.41.1 daily; else yarn build 1.41.1 $DRONE_TAG; fi + - if [ ! -n $DRONE_TAG ]; then yarn binary 1.41.1 daily; else yarn binary 1.41.1 $DRONE_TAG; fi + + - name: build-alpine + image: node:12-alpine + commands: + - apk add libxkbfile-dev libsecret-dev build-base git + - yarn + - if [ ! -n $DRONE_TAG ]; then yarn build 1.41.1 daily; else yarn build 1.41.1 $DRONE_TAG; fi + - if [ ! -n $DRONE_TAG ]; then yarn binary 1.41.1 daily; else yarn binary 1.41.1 $DRONE_TAG; fi + + - name: publish + image: plugins/github-release + settings: + api_key: + from_secret: gh-token + files: '*.tar.gz' + when: + event: tag + +--- +kind: pipeline +type: docker +name: build-arm + +platform: + arch: arm + +steps: + + - name: build + image: node:12 + commands: + - apt update && apt install -y build-essential git libsecret-1-dev libx11-dev libxkbfile-dev + - yarn + - if [ ! -n $DRONE_TAG ]; then yarn build 1.41.1 daily; else yarn build 1.41.1 $DRONE_TAG; fi + - if [ ! -n $DRONE_TAG ]; then yarn binary 1.41.1 daily; else yarn binary 1.41.1 $DRONE_TAG; fi + + - name: build-alpine + image: node:12-alpine + commands: + - apk add libxkbfile-dev libsecret-dev build-base git + - yarn + - if [ ! -n $DRONE_TAG ]; then yarn build 1.41.1 daily; else yarn build 1.41.1 $DRONE_TAG; fi + - if [ ! -n $DRONE_TAG ]; then yarn binary 1.41.1 daily; else yarn binary 1.41.1 $DRONE_TAG; fi + + - name: publish + image: plugins/github-release + settings: + api_key: + from_secret: gh-token + files: '*.tar.gz' + when: + event: tag \ No newline at end of file From deba12d2754a29fe002ee4554c4131cb15b7c523 Mon Sep 17 00:00:00 2001 From: Ayane Satomi Date: Fri, 10 Jan 2020 23:16:29 +0800 Subject: [PATCH 02/10] ci: use debian for publish step Signed-off-by: Ayane Satomi --- .drone.yml | 58 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 23 deletions(-) diff --git a/.drone.yml b/.drone.yml index eb07c737a042..0d261e24d92f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,26 +11,30 @@ steps: image: node:12 commands: - apt update && apt install -y build-essential git libsecret-1-dev libx11-dev libxkbfile-dev - - yarn - if [ ! -n $DRONE_TAG ]; then yarn build 1.41.1 daily; else yarn build 1.41.1 $DRONE_TAG; fi - if [ ! -n $DRONE_TAG ]; then yarn binary 1.41.1 daily; else yarn binary 1.41.1 $DRONE_TAG; fi + - if [ ! -n $DRONE_TAG ]; then yarn package 1.41.1 daily; else yarn package 1.41.1 $DRONE_TAG; fi - name: build-alpine image: node:12-alpine commands: - apk add libxkbfile-dev libsecret-dev build-base git - - yarn - if [ ! -n $DRONE_TAG ]; then yarn build 1.41.1 daily; else yarn build 1.41.1 $DRONE_TAG; fi - if [ ! -n $DRONE_TAG ]; then yarn binary 1.41.1 daily; else yarn binary 1.41.1 $DRONE_TAG; fi + - if [ ! -n $DRONE_TAG ]; then yarn package 1.41.1 daily; else yarn package 1.41.1 $DRONE_TAG; fi - name: publish - image: plugins/github-release - settings: - api_key: - from_secret: gh-token - files: '*.tar.gz' + image: debian + commands: + - apt-get update && apt-get install -y wget + - wget -qO - https://github.com/tcnksm/ghr/releases/download/v0.12.0/ghr_v0.12.0_linux_amd64.tar.gz | tar -xvz + - chmod -R 777 ghr_v0.12.0_linux_amd64/* + - ./ghr_v0.12.0_linux_amd64/ghr "$DRONE_TAG" ./release/ + environment: + GITHUB_TOKEN: + from_secret: gh-token when: - event: tag + event: tag --- kind: pipeline @@ -46,26 +50,30 @@ steps: image: node:12 commands: - apt update && apt install -y build-essential git libsecret-1-dev libx11-dev libxkbfile-dev - - yarn - if [ ! -n $DRONE_TAG ]; then yarn build 1.41.1 daily; else yarn build 1.41.1 $DRONE_TAG; fi - if [ ! -n $DRONE_TAG ]; then yarn binary 1.41.1 daily; else yarn binary 1.41.1 $DRONE_TAG; fi + - if [ ! -n $DRONE_TAG ]; then yarn package 1.41.1 daily; else yarn package 1.41.1 $DRONE_TAG; fi - name: build-alpine image: node:12-alpine commands: - apk add libxkbfile-dev libsecret-dev build-base git - - yarn - if [ ! -n $DRONE_TAG ]; then yarn build 1.41.1 daily; else yarn build 1.41.1 $DRONE_TAG; fi - if [ ! -n $DRONE_TAG ]; then yarn binary 1.41.1 daily; else yarn binary 1.41.1 $DRONE_TAG; fi + - if [ ! -n $DRONE_TAG ]; then yarn package 1.41.1 daily; else yarn package 1.41.1 $DRONE_TAG; fi - name: publish - image: plugins/github-release - settings: - api_key: - from_secret: gh-token - files: '*.tar.gz' + image: debian + commands: + - apt-get update && apt-get install -y wget + - wget -qO - https://github.com/tcnksm/ghr/releases/download/v0.12.0/ghr_v0.12.0_linux_amd64.tar.gz | tar -xvz + - chmod -R 777 ghr_v0.12.0_linux_amd64/* + - ./ghr_v0.12.0_linux_amd64/ghr "$DRONE_TAG" ./release/ + environment: + GITHUB_TOKEN: + from_secret: gh-token when: - event: tag + event: tag --- kind: pipeline @@ -89,15 +97,19 @@ steps: image: node:12-alpine commands: - apk add libxkbfile-dev libsecret-dev build-base git - - yarn - if [ ! -n $DRONE_TAG ]; then yarn build 1.41.1 daily; else yarn build 1.41.1 $DRONE_TAG; fi - if [ ! -n $DRONE_TAG ]; then yarn binary 1.41.1 daily; else yarn binary 1.41.1 $DRONE_TAG; fi + - if [ ! -n $DRONE_TAG ]; then yarn package 1.41.1 daily; else yarn package 1.41.1 $DRONE_TAG; fi - name: publish - image: plugins/github-release - settings: - api_key: - from_secret: gh-token - files: '*.tar.gz' + image: debian + commands: + - apt-get update && apt-get install -y wget + - wget -qO - https://github.com/tcnksm/ghr/releases/download/v0.12.0/ghr_v0.12.0_linux_amd64.tar.gz | tar -xvz + - chmod -R 777 ghr_v0.12.0_linux_amd64/* + - ./ghr_v0.12.0_linux_amd64/ghr "$DRONE_TAG" ./release/ + environment: + GITHUB_TOKEN: + from_secret: gh-token when: - event: tag \ No newline at end of file + event: tag From 1efddf9ac3633c0813ae1cca698bf468f54d331f Mon Sep 17 00:00:00 2001 From: Ayane Satomi Date: Fri, 10 Jan 2020 23:21:00 +0800 Subject: [PATCH 03/10] ci: check for emptiness instead Signed-off-by: Ayane Satomi --- .drone.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.drone.yml b/.drone.yml index 0d261e24d92f..34f213e832ae 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,17 +11,17 @@ steps: image: node:12 commands: - apt update && apt install -y build-essential git libsecret-1-dev libx11-dev libxkbfile-dev - - if [ ! -n $DRONE_TAG ]; then yarn build 1.41.1 daily; else yarn build 1.41.1 $DRONE_TAG; fi - - if [ ! -n $DRONE_TAG ]; then yarn binary 1.41.1 daily; else yarn binary 1.41.1 $DRONE_TAG; fi - - if [ ! -n $DRONE_TAG ]; then yarn package 1.41.1 daily; else yarn package 1.41.1 $DRONE_TAG; fi + - if [ -z $DRONE_TAG ]; then yarn build 1.41.1 daily ; else yarn build 1.41.1 $DRONE_TAG; fi + - if [ -z $DRONE_TAG ]; then yarn binary 1.41.1 daily ; else yarn binary 1.41.1 $DRONE_TAG; fi + - if [ -z $DRONE_TAG ]; then yarn package 1.41.1 daily ; else yarn package 1.41.1 $DRONE_TAG; fi - name: build-alpine image: node:12-alpine commands: - apk add libxkbfile-dev libsecret-dev build-base git - - if [ ! -n $DRONE_TAG ]; then yarn build 1.41.1 daily; else yarn build 1.41.1 $DRONE_TAG; fi - - if [ ! -n $DRONE_TAG ]; then yarn binary 1.41.1 daily; else yarn binary 1.41.1 $DRONE_TAG; fi - - if [ ! -n $DRONE_TAG ]; then yarn package 1.41.1 daily; else yarn package 1.41.1 $DRONE_TAG; fi + - if [ -z $DRONE_TAG ]; then yarn build 1.41.1 daily ; else yarn build 1.41.1 $DRONE_TAG; fi + - if [ -z $DRONE_TAG ]; then yarn binary 1.41.1 daily ; else yarn binary 1.41.1 $DRONE_TAG; fi + - if [ -z $DRONE_TAG ]; then yarn package 1.41.1 daily ; else yarn package 1.41.1 $DRONE_TAG; fi - name: publish image: debian @@ -50,17 +50,17 @@ steps: image: node:12 commands: - apt update && apt install -y build-essential git libsecret-1-dev libx11-dev libxkbfile-dev - - if [ ! -n $DRONE_TAG ]; then yarn build 1.41.1 daily; else yarn build 1.41.1 $DRONE_TAG; fi - - if [ ! -n $DRONE_TAG ]; then yarn binary 1.41.1 daily; else yarn binary 1.41.1 $DRONE_TAG; fi - - if [ ! -n $DRONE_TAG ]; then yarn package 1.41.1 daily; else yarn package 1.41.1 $DRONE_TAG; fi + - if [ -z $DRONE_TAG ]; then yarn build 1.41.1 daily ; else yarn build 1.41.1 $DRONE_TAG; fi + - if [ -z $DRONE_TAG ]; then yarn binary 1.41.1 daily ; else yarn binary 1.41.1 $DRONE_TAG; fi + - if [ -z $DRONE_TAG ]; then yarn package 1.41.1 daily ; else yarn package 1.41.1 $DRONE_TAG; fi - name: build-alpine image: node:12-alpine commands: - apk add libxkbfile-dev libsecret-dev build-base git - - if [ ! -n $DRONE_TAG ]; then yarn build 1.41.1 daily; else yarn build 1.41.1 $DRONE_TAG; fi - - if [ ! -n $DRONE_TAG ]; then yarn binary 1.41.1 daily; else yarn binary 1.41.1 $DRONE_TAG; fi - - if [ ! -n $DRONE_TAG ]; then yarn package 1.41.1 daily; else yarn package 1.41.1 $DRONE_TAG; fi + - if [ -z $DRONE_TAG ]; then yarn build 1.41.1 daily ; else yarn build 1.41.1 $DRONE_TAG; fi + - if [ -z $DRONE_TAG ]; then yarn binary 1.41.1 daily ; else yarn binary 1.41.1 $DRONE_TAG; fi + - if [ -z $DRONE_TAG ]; then yarn package 1.41.1 daily ; else yarn package 1.41.1 $DRONE_TAG; fi - name: publish image: debian @@ -90,16 +90,16 @@ steps: commands: - apt update && apt install -y build-essential git libsecret-1-dev libx11-dev libxkbfile-dev - yarn - - if [ ! -n $DRONE_TAG ]; then yarn build 1.41.1 daily; else yarn build 1.41.1 $DRONE_TAG; fi - - if [ ! -n $DRONE_TAG ]; then yarn binary 1.41.1 daily; else yarn binary 1.41.1 $DRONE_TAG; fi + - if [ -z $DRONE_TAG ]; then yarn build 1.41.1 daily ; else yarn build 1.41.1 $DRONE_TAG; fi + - if [ -z $DRONE_TAG ]; then yarn binary 1.41.1 daily ; else yarn binary 1.41.1 $DRONE_TAG; fi - name: build-alpine image: node:12-alpine commands: - apk add libxkbfile-dev libsecret-dev build-base git - - if [ ! -n $DRONE_TAG ]; then yarn build 1.41.1 daily; else yarn build 1.41.1 $DRONE_TAG; fi - - if [ ! -n $DRONE_TAG ]; then yarn binary 1.41.1 daily; else yarn binary 1.41.1 $DRONE_TAG; fi - - if [ ! -n $DRONE_TAG ]; then yarn package 1.41.1 daily; else yarn package 1.41.1 $DRONE_TAG; fi + - if [ -z $DRONE_TAG ]; then yarn build 1.41.1 daily ; else yarn build 1.41.1 $DRONE_TAG; fi + - if [ -z $DRONE_TAG ]; then yarn binary 1.41.1 daily ; else yarn binary 1.41.1 $DRONE_TAG; fi + - if [ -z $DRONE_TAG ]; then yarn package 1.41.1 daily ; else yarn package 1.41.1 $DRONE_TAG; fi - name: publish image: debian From d93165f642e60d37a97a91124929d2cfdb67d6fd Mon Sep 17 00:00:00 2001 From: Ayane Satomi Date: Sat, 11 Jan 2020 23:59:56 +0800 Subject: [PATCH 04/10] ci: reuse github-release Signed-off-by: Ayane Satomi --- .drone.yml | 42 +++++++++++++++--------------------------- 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/.drone.yml b/.drone.yml index 34f213e832ae..ca41d4a1a9ba 100644 --- a/.drone.yml +++ b/.drone.yml @@ -24,15 +24,11 @@ steps: - if [ -z $DRONE_TAG ]; then yarn package 1.41.1 daily ; else yarn package 1.41.1 $DRONE_TAG; fi - name: publish - image: debian - commands: - - apt-get update && apt-get install -y wget - - wget -qO - https://github.com/tcnksm/ghr/releases/download/v0.12.0/ghr_v0.12.0_linux_amd64.tar.gz | tar -xvz - - chmod -R 777 ghr_v0.12.0_linux_amd64/* - - ./ghr_v0.12.0_linux_amd64/ghr "$DRONE_TAG" ./release/ - environment: - GITHUB_TOKEN: - from_secret: gh-token + image: plugins/github-release + settings: + api_key: + from_secret: github_token + files: release/*.tar.gz when: event: tag @@ -63,15 +59,11 @@ steps: - if [ -z $DRONE_TAG ]; then yarn package 1.41.1 daily ; else yarn package 1.41.1 $DRONE_TAG; fi - name: publish - image: debian - commands: - - apt-get update && apt-get install -y wget - - wget -qO - https://github.com/tcnksm/ghr/releases/download/v0.12.0/ghr_v0.12.0_linux_amd64.tar.gz | tar -xvz - - chmod -R 777 ghr_v0.12.0_linux_amd64/* - - ./ghr_v0.12.0_linux_amd64/ghr "$DRONE_TAG" ./release/ - environment: - GITHUB_TOKEN: - from_secret: gh-token + image: plugins/github-release + settings: + api_key: + from_secret: github_token + files: release/*.tar.gz when: event: tag @@ -102,14 +94,10 @@ steps: - if [ -z $DRONE_TAG ]; then yarn package 1.41.1 daily ; else yarn package 1.41.1 $DRONE_TAG; fi - name: publish - image: debian - commands: - - apt-get update && apt-get install -y wget - - wget -qO - https://github.com/tcnksm/ghr/releases/download/v0.12.0/ghr_v0.12.0_linux_amd64.tar.gz | tar -xvz - - chmod -R 777 ghr_v0.12.0_linux_amd64/* - - ./ghr_v0.12.0_linux_amd64/ghr "$DRONE_TAG" ./release/ - environment: - GITHUB_TOKEN: - from_secret: gh-token + image: plugins/github-release + settings: + api_key: + from_secret: github_token + files: release/*.tar.gz when: event: tag From 1fdebeb86278def65170346049ee23dab267100f Mon Sep 17 00:00:00 2001 From: Ayane Satomi Date: Sun, 12 Jan 2020 00:29:07 +0800 Subject: [PATCH 05/10] ci: reduce Travis to only MacOS builds Signed-off-by: Ayane Satomi --- .travis.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5b45b7ceb32c..9fb72b00fb49 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,18 +15,6 @@ before_install: # Don't build on tags because we'll already have built the commit. jobs: include: - - name: "Linux build" - os: linux - dist: trusty - env: TARGET="linux" PUSH_DOCKER="true" - if: tag IS blank - script: scripts/ci.bash - - name: "Alpine build" - os: linux - dist: trusty - env: TARGET="alpine" - if: tag IS blank - script: scripts/ci.bash - name: "MacOS build" os: osx if: tag IS blank From 71faf6d8ad69a2bc377388e2db9559dcc184d440 Mon Sep 17 00:00:00 2001 From: Ayane Satomi Date: Mon, 13 Jan 2020 17:30:06 +0800 Subject: [PATCH 06/10] ci: add fix for docker Signed-off-by: Ayane Satomi --- Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Dockerfile b/Dockerfile index 934192ba0497..a70f2e8aeeb2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,6 +52,11 @@ RUN mkdir -p /home/coder/project # To avoid EACCES issues on f.ex Crostini (ChromeOS) RUN mkdir -p /home/coder/.local/share/code-server +# FIXME: permission fix required for bind-mounts +# See GH-1270 +RUN sudo chmod -R g+rw /home/coder/project && sudo chmod -R g+rw /home/coder/.local/share/code-server && \ + sudo chown -R coder:coder /home/coder + WORKDIR /home/coder/project # This ensures we have a volume mounted even if the user forgot to do bind From 6b24bce486657b48239e10fb5449503b4754173f Mon Sep 17 00:00:00 2001 From: Ayane Satomi Date: Mon, 13 Jan 2020 17:31:44 +0800 Subject: [PATCH 07/10] ci: comment out ARM32 builds for now We're still investigating with Drone why we can't build 32-bit so we'll just comment it out Signed-off-by: Ayane Satomi --- .drone.yml | 68 +++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/.drone.yml b/.drone.yml index ca41d4a1a9ba..0b3f51bf7364 100644 --- a/.drone.yml +++ b/.drone.yml @@ -67,37 +67,37 @@ steps: when: event: tag ---- -kind: pipeline -type: docker -name: build-arm - -platform: - arch: arm - -steps: - - - name: build - image: node:12 - commands: - - apt update && apt install -y build-essential git libsecret-1-dev libx11-dev libxkbfile-dev - - yarn - - if [ -z $DRONE_TAG ]; then yarn build 1.41.1 daily ; else yarn build 1.41.1 $DRONE_TAG; fi - - if [ -z $DRONE_TAG ]; then yarn binary 1.41.1 daily ; else yarn binary 1.41.1 $DRONE_TAG; fi - - - name: build-alpine - image: node:12-alpine - commands: - - apk add libxkbfile-dev libsecret-dev build-base git - - if [ -z $DRONE_TAG ]; then yarn build 1.41.1 daily ; else yarn build 1.41.1 $DRONE_TAG; fi - - if [ -z $DRONE_TAG ]; then yarn binary 1.41.1 daily ; else yarn binary 1.41.1 $DRONE_TAG; fi - - if [ -z $DRONE_TAG ]; then yarn package 1.41.1 daily ; else yarn package 1.41.1 $DRONE_TAG; fi - - - name: publish - image: plugins/github-release - settings: - api_key: - from_secret: github_token - files: release/*.tar.gz - when: - event: tag +# --- +# kind: pipeline +# type: docker +# name: build-arm +# +# platform: +# arch: arm +# +# steps: +# +# - name: build +# image: node:12 +# commands: +# - apt update && apt install -y build-essential git libsecret-1-dev libx11-dev libxkbfile-dev +# - yarn +# - if [ -z $DRONE_TAG ]; then yarn build 1.41.1 daily ; else yarn build 1.41.1 $DRONE_TAG; fi +# - if [ -z $DRONE_TAG ]; then yarn binary 1.41.1 daily ; else yarn binary 1.41.1 $DRONE_TAG; fi +# +# - name: build-alpine +# image: node:12-alpine +# commands: +# - apk add libxkbfile-dev libsecret-dev build-base git +# - if [ -z $DRONE_TAG ]; then yarn build 1.41.1 daily ; else yarn build 1.41.1 $DRONE_TAG; fi +# - if [ -z $DRONE_TAG ]; then yarn binary 1.41.1 daily ; else yarn binary 1.41.1 $DRONE_TAG; fi +# - if [ -z $DRONE_TAG ]; then yarn package 1.41.1 daily ; else yarn package 1.41.1 $DRONE_TAG; fi +# +# - name: publish +# image: plugins/github-release +# settings: +# api_key: +# from_secret: github_token +# files: release/*.tar.gz +# when: +# event: tag From 83a845e12ab561443263e849b73e40c7e6ecf61a Mon Sep 17 00:00:00 2001 From: Ayane Satomi Date: Mon, 13 Jan 2020 17:36:41 +0800 Subject: [PATCH 08/10] ci: add Docker step using Kaniko Signed-off-by: Ayane Satomi --- .drone.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/.drone.yml b/.drone.yml index 0b3f51bf7364..fd3dde507cbb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -32,6 +32,22 @@ steps: when: event: tag +- name: docker-publish + image: banzaicloud/drone-kaniko + settings: + username: + from_secret: docker_user + password: + from_secret: docker_password + tags: + - latest + - $DRONE_TAG + build_args: + - codeServerVersion=$DRONE_TAG + - vscodeVersion=1.41.1 + when: + event: tag + --- kind: pipeline type: docker @@ -67,6 +83,22 @@ steps: when: event: tag +- name: docker-publish + image: banzaicloud/drone-kaniko + settings: + username: + from_secret: docker_user + password: + from_secret: docker_password + tags: + - latest + - $DRONE_TAG + build_args: + - codeServerVersion=$DRONE_TAG + - vscodeVersion=1.41.1 + when: + event: tag + # --- # kind: pipeline # type: docker From e68f9f73ec4e0d58ba3d11168b628b93cc523c10 Mon Sep 17 00:00:00 2001 From: Ayane Satomi Date: Mon, 13 Jan 2020 17:39:14 +0800 Subject: [PATCH 09/10] ci: use Drone substitution Signed-off-by: Ayane Satomi --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index fd3dde507cbb..39c75f908566 100644 --- a/.drone.yml +++ b/.drone.yml @@ -41,9 +41,9 @@ steps: from_secret: docker_password tags: - latest - - $DRONE_TAG + - ${DRONE_TAG} build_args: - - codeServerVersion=$DRONE_TAG + - codeServerVersion=${DRONE_TAG} - vscodeVersion=1.41.1 when: event: tag @@ -91,8 +91,8 @@ steps: password: from_secret: docker_password tags: - - latest - - $DRONE_TAG + - latest-arm64 + - ${DRONE_TAG}-arm64 build_args: - codeServerVersion=$DRONE_TAG - vscodeVersion=1.41.1 From 1c4189c4148e65ff6f9a431e914bc83e7e90a2fd Mon Sep 17 00:00:00 2001 From: Ayane Satomi Date: Mon, 13 Jan 2020 17:41:38 +0800 Subject: [PATCH 10/10] ci: lint Signed-off-by: Ayane Satomi --- .drone.yml | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/.drone.yml b/.drone.yml index 39c75f908566..a0b1a97741c3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -32,21 +32,21 @@ steps: when: event: tag -- name: docker-publish - image: banzaicloud/drone-kaniko - settings: - username: - from_secret: docker_user - password: - from_secret: docker_password - tags: - - latest - - ${DRONE_TAG} - build_args: - - codeServerVersion=${DRONE_TAG} - - vscodeVersion=1.41.1 - when: - event: tag + - name: docker-publish + image: banzaicloud/drone-kaniko + settings: + username: + from_secret: docker_user + password: + from_secret: docker_password + tags: + - latest + - ${DRONE_TAG} + build_args: + - codeServerVersion=${DRONE_TAG} + - vscodeVersion=1.41.1 + when: + event: tag --- kind: pipeline @@ -83,21 +83,21 @@ steps: when: event: tag -- name: docker-publish - image: banzaicloud/drone-kaniko - settings: - username: - from_secret: docker_user - password: - from_secret: docker_password - tags: - - latest-arm64 - - ${DRONE_TAG}-arm64 - build_args: - - codeServerVersion=$DRONE_TAG - - vscodeVersion=1.41.1 - when: - event: tag + - name: docker-publish + image: banzaicloud/drone-kaniko + settings: + username: + from_secret: docker_user + password: + from_secret: docker_password + tags: + - latest-arm64 + - ${DRONE_TAG}-arm64 + build_args: + - codeServerVersion=$DRONE_TAG + - vscodeVersion=1.41.1 + when: + event: tag # --- # kind: pipeline