feat(升级镜像): 更新Go和NDK
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
xiaoqidun 2024-03-13 16:05:37 +08:00
parent 6210f6b195
commit cf514fbbb7
3 changed files with 9 additions and 9 deletions

@ -11,9 +11,9 @@ steps:
commands: commands:
- sed -i "s|deb.debian.org|mirrors.ustc.edu.cn|g" /etc/apt/sources.list.d/debian.sources - 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-r26b-linux.zip - wget -q -T 180 -4 https://dl.google.com/android/repository/android-ndk-r26c-linux.zip
- unzip -q android-ndk-r26b-linux.zip - unzip -q android-ndk-r26c-linux.zip
- rm -f android-ndk-r26b-linux.zip - rm -f android-ndk-r26c-linux.zip
- name: docker-cn - name: docker-cn
pull: if-not-exists pull: if-not-exists
image: plugins/docker image: plugins/docker

@ -1,5 +1,5 @@
# 基础镜像 # 基础镜像
FROM golang:1.22.0-bookworm FROM golang:1.22.1-bookworm
# 作者信息 # 作者信息
LABEL MAINTAINER="xiaoqidun@gmail.com" LABEL MAINTAINER="xiaoqidun@gmail.com"
@ -14,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-r26b /usr/local/android-ndk-r26b COPY android-ndk-r26c /usr/local/android-ndk-r26c
# 环境变量 # 环境变量
ENV PATH=$PATH:/usr/local/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin ENV PATH=$PATH:/usr/local/android-ndk-r26c/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

@ -1,5 +1,5 @@
# 基础镜像 # 基础镜像
FROM golang:1.22.0-bookworm FROM golang:1.22.1-bookworm
# 作者信息 # 作者信息
LABEL MAINTAINER="xiaoqidun@gmail.com" LABEL MAINTAINER="xiaoqidun@gmail.com"
@ -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-r26b /usr/local/android-ndk-r26b COPY android-ndk-r26c /usr/local/android-ndk-r26c
# 环境变量 # 环境变量
ENV PATH=$PATH:/usr/local/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin ENV PATH=$PATH:/usr/local/android-ndk-r26c/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