diff --git a/Makefile b/Makefile index 32ae347a..a6939bf7 100644 --- a/Makefile +++ b/Makefile @@ -89,8 +89,8 @@ container: ############################ build local .PHONY: container-local container-local: kubevpn-linux-amd64 - docker buildx build --platform linux/amd64 -t docker.io/naison/kubevpn:latest -f $(BUILD_DIR)/local.Dockerfile --push . + docker buildx build --platform linux/amd64,linux/arm64 -t docker.io/naison/kubevpn:latest -f $(BUILD_DIR)/local.Dockerfile --push . .PHONY: container-test container-test: kubevpn-linux-amd64 - docker buildx build --platform linux/amd64 -t docker.io/naison/kubevpn:test -f $(BUILD_DIR)/test.Dockerfile --push . \ No newline at end of file + docker buildx build --platform linux/amd64,linux/arm64 -t docker.io/naison/kubevpn:test -f $(BUILD_DIR)/test.Dockerfile --push . \ No newline at end of file diff --git a/build/Dockerfile b/build/Dockerfile index 02189b45..87336d27 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -16,7 +16,16 @@ ARG BASE=github.com/wencaiwulue/kubevpn RUN sed -i s@/security.ubuntu.com/@/mirrors.aliyun.com/@g /etc/apt/sources.list \ && sed -i s@/archive.ubuntu.com/@/mirrors.aliyun.com/@g /etc/apt/sources.list RUN apt-get clean && apt-get update && apt-get install -y wget dnsutils vim curl \ - net-tools iptables iputils-ping lsof iproute2 tcpdump binutils traceroute + net-tools iptables iputils-ping lsof iproute2 tcpdump binutils traceroute \ + +ENV TZ=Asia/Shanghai \ + DEBIAN_FRONTEND=noninteractive +RUN apt update \ + && apt install -y tzdata \ + && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime \ + && echo ${TZ} > /etc/timezone \ + && dpkg-reconfigure --frontend noninteractive tzdata \ + && rm -rf /var/lib/apt/lists/* WORKDIR /app diff --git a/build/local.Dockerfile b/build/local.Dockerfile index 4bd1e3af..a0aae4d6 100644 --- a/build/local.Dockerfile +++ b/build/local.Dockerfile @@ -6,6 +6,15 @@ RUN sed -i s@/security.ubuntu.com/@/mirrors.aliyun.com/@g /etc/apt/sources.list RUN apt-get clean && apt-get update && apt-get install -y wget dnsutils vim curl \ net-tools iptables iputils-ping lsof iproute2 tcpdump binutils traceroute +ENV TZ=Asia/Shanghai \ + DEBIAN_FRONTEND=noninteractive +RUN apt update \ + && apt install -y tzdata \ + && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime \ + && echo ${TZ} > /etc/timezone \ + && dpkg-reconfigure --frontend noninteractive tzdata \ + && rm -rf /var/lib/apt/lists/* + WORKDIR /app COPY bin/kubevpn /usr/local/bin/kubevpn