From a1f938c8721d7c8c4ebebd5170fda593fd8913d4 Mon Sep 17 00:00:00 2001 From: xiaoqidun Date: Sun, 15 Oct 2023 23:23:33 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC):=20?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 23 ++++------------------- DockerfileCN | 2 +- DockerfileHK | 2 +- 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/.drone.yml b/.drone.yml index b9d6798..dbf03d4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,7 +1,7 @@ --- kind: pipeline type: docker -name: docker-cn +name: default node: region: cn steps: @@ -14,7 +14,7 @@ steps: - wget -q -T 180 -4 https://dl.google.com/android/repository/android-ndk-r26-linux.zip - unzip -q android-ndk-r26-linux.zip - rm -f android-ndk-r26-linux.zip - - name: docker + - name: docker-cn pull: if-not-exists image: plugins/docker settings: @@ -25,22 +25,7 @@ steps: password: from_secret: docker_password dockerfile: DockerfileCN ---- -kind: pipeline -type: docker -name: docker-hk -node: - region: cn -steps: - - name: build - pull: if-not-exists - image: debian - commands: - - apt-get update && apt-get install -y wget unzip && rm -rf /var/lib/apt/lists/* - - wget -q -T 180 -4 https://dl.google.com/android/repository/android-ndk-r26-linux.zip - - unzip -q android-ndk-r26-linux.zip - - rm -f android-ndk-r26-linux.zip - - name: docker + - name: docker-hk pull: if-not-exists image: plugins/docker settings: @@ -50,4 +35,4 @@ steps: from_secret: docker_username password: from_secret: docker_password - dockerfile: DockerfileHK \ No newline at end of file + dockerfile: DockerfileHK diff --git a/DockerfileCN b/DockerfileCN index ab8c885..db7820e 100644 --- a/DockerfileCN +++ b/DockerfileCN @@ -1,5 +1,5 @@ # 基础镜像 -FROM golang:1.21.2-bookworm +FROM golang:1.21.3-bookworm # 作者信息 LABEL MAINTAINER="xiaoqidun@gmail.com" diff --git a/DockerfileHK b/DockerfileHK index ecaf965..d5c6c04 100644 --- a/DockerfileHK +++ b/DockerfileHK @@ -1,5 +1,5 @@ # 基础镜像 -FROM golang:1.21.2-bookworm +FROM golang:1.21.3-bookworm # 作者信息 LABEL MAINTAINER="xiaoqidun@gmail.com"