From ac79ceb04e0ce6ec670560cdf134fb066026b005 Mon Sep 17 00:00:00 2001 From: Sakurasan <1173092237@qq.com> Date: Mon, 1 May 2023 22:31:53 +0800 Subject: [PATCH] update --- docker/Dockerfile | 5 +++-- makefile | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 67013c4..6609c64 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ FROM golang:1.19.7-alpine as builder LABEL anther="github.com/Sakurasan" -RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && apk update && apk --no-cache add openssl make cmake upx +RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && apk --no-cache add make cmake upx WORKDIR /build COPY . /build ENV GO111MODULE=on @@ -12,9 +12,10 @@ FROM alpine:latest AS runner # 设置alpine 时间为上海时间 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && apk update && apk --no-cache add tzdata && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ && echo "Asia/Shanghai" > /etc/timezone \ - && apk del tzdata && export GIN_MODE=release + && export PATH=$PATH:/app # RUN apk update && apk --no-cache add openssl libgcc libstdc++ binutils WORKDIR /app COPY --from=builder /build/bin/opencatd /app/opencatd +ENV GIN_MODE=release EXPOSE 80 ENTRYPOINT ["/app/opencatd"] \ No newline at end of file diff --git a/makefile b/makefile index 111700e..565939d 100644 --- a/makefile +++ b/makefile @@ -24,11 +24,12 @@ build: upx -9 bin/opencatd .PHONY:docker +# build docker images docker: docker run --privileged --rm tonistiigi/binfmt --install all - docker buildx create --use --name xbuilder + docker buildx create --use --name xbuilder --driver docker-container docker buildx inspect xbuilder --bootstrap - docker buildx build --platform linux/amd64,linux/arm64 -t mirrors2/opencatd:latest . --push + docker buildx build --platform linux/amd64,linux/arm64 -t mirrors2/opencatd:latest -f docker/Dockerfile . --push .PHONY: clean # clean