feat(升级依赖): 升级依赖
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
xiaoqidun 2023-09-29 15:35:25 +08:00
parent 5f65de79bb
commit ae2335889f
3 changed files with 30 additions and 11 deletions

View File

@ -1,19 +1,20 @@
--- ---
kind: pipeline kind: pipeline
type: docker type: docker
name: default name: docker-cn
node: node:
region: hk region: cn
steps: steps:
- name: build - name: build
pull: if-not-exists pull: if-not-exists
image: debian image: debian
commands: commands:
- sed -i "s|deb.debian.org|mirrors.ustc.edu.cn|g" /etc/apt/sources.list.d/debian.sources
- apt-get update && apt-get install -y wget unzip && rm -rf /var/lib/apt/lists/* - 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-r25c-linux.zip - wget -q -T 180 -4 https://dl.google.com/android/repository/android-ndk-r26-linux.zip
- unzip -q android-ndk-r25c-linux.zip - unzip -q android-ndk-r26-linux.zip
- rm -f android-ndk-r25c-linux.zip - rm -f android-ndk-r26-linux.zip
- name: docker-cn - name: docker
pull: if-not-exists pull: if-not-exists
image: plugins/docker image: plugins/docker
settings: settings:
@ -24,7 +25,22 @@ steps:
password: password:
from_secret: docker_password from_secret: docker_password
dockerfile: DockerfileCN dockerfile: DockerfileCN
- name: docker-hk ---
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
pull: if-not-exists pull: if-not-exists
image: plugins/docker image: plugins/docker
settings: settings:

View File

@ -4,6 +4,9 @@ FROM golang:1.21.1-bookworm
# 作者信息 # 作者信息
LABEL MAINTAINER="xiaoqidun@gmail.com" LABEL MAINTAINER="xiaoqidun@gmail.com"
# 使用中国软件源
RUN sed -i "s|deb.debian.org|mirrors.ustc.edu.cn|g" /etc/apt/sources.list.d/debian.sources
# 安装编译工具链 # 安装编译工具链
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y \ && apt-get install -y \
@ -11,9 +14,9 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# 安装android ndk # 安装android ndk
COPY android-ndk-r25c /usr/local/android-ndk-r25c COPY android-ndk-r26 /usr/local/android-ndk-r26
# 环境变量 # 环境变量
ENV PATH=$PATH:/usr/local/android-ndk-r25c/toolchains/llvm/prebuilt/linux-x86_64/bin ENV PATH=$PATH:/usr/local/android-ndk-r26/toolchains/llvm/prebuilt/linux-x86_64/bin
ENV GO111MODULE=on ENV GO111MODULE=on
ENV GOPROXY=https://goproxy.cn,direct ENV GOPROXY=https://goproxy.cn,direct

View File

@ -11,9 +11,9 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# 安装android ndk # 安装android ndk
COPY android-ndk-r25c /usr/local/android-ndk-r25c COPY android-ndk-r26 /usr/local/android-ndk-r26
# 环境变量 # 环境变量
ENV PATH=$PATH:/usr/local/android-ndk-r25c/toolchains/llvm/prebuilt/linux-x86_64/bin ENV PATH=$PATH:/usr/local/android-ndk-r26/toolchains/llvm/prebuilt/linux-x86_64/bin
ENV GO111MODULE=on ENV GO111MODULE=on
ENV GOPROXY=https://goproxy.aite.xyz,direct ENV GOPROXY=https://goproxy.aite.xyz,direct