From 3d08ba4ee2e8e0f890a23270f8b45920632819f3 Mon Sep 17 00:00:00 2001 From: jjxu <428192774@qq.com> Date: Fri, 7 Apr 2023 11:42:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E6=B5=8B?= =?UTF-8?q?=E8=AF=953?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DockerBuildTest.bat | 2 +- DockerfileSlim | 3 +-- DockerfileWindowsTest | 3 +++ conf/buildDate | 0 4 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 conf/buildDate diff --git a/DockerBuildTest.bat b/DockerBuildTest.bat index 21e5d2e..518ebcb 100644 --- a/DockerBuildTest.bat +++ b/DockerBuildTest.bat @@ -5,7 +5,7 @@ cd .. go build -ldflags "-s -w" -o ./build/artistinfo-dev ./cmd/app.go docker rmi artistinfo-dev docker rmi 121.229.45.214:9006/artistinfo-dev -docker build . --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') -f .\DockerfileWindowsTest -t artistinfo-dev +docker build . -f .\DockerfileWindowsTest -t artistinfo-dev --build-arg BUILD_DATE=$(date) docker tag artistinfo-dev 121.229.45.214:9006/artistinfo-dev docker push 121.229.45.214:9006/artistinfo-dev pause \ No newline at end of file diff --git a/DockerfileSlim b/DockerfileSlim index 1b0d3cd..2e1c48e 100644 --- a/DockerfileSlim +++ b/DockerfileSlim @@ -16,5 +16,4 @@ COPY ./conf/ ./conf/ WORKDIR /app/main-client/bin # 在容器启动时输出环境变量BUILD_DATE的值 -CMD ["sh", "-c","echo", "Container was built on: ${BUILD_DATE}", "&&./mainServer"] -# CMD ["./mainServer"] \ No newline at end of file +CMD ["./mainServer"] \ No newline at end of file diff --git a/DockerfileWindowsTest b/DockerfileWindowsTest index 45e7697..a35c8b5 100644 --- a/DockerfileWindowsTest +++ b/DockerfileWindowsTest @@ -21,6 +21,9 @@ WORKDIR /build COPY ./build/artistinfo-dev /app/artistinfo-dev FROM alpine + +ARG BUILD_DATE +ENV BUILD_DATE ${BUILD_DATE} RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories RUN apk update --no-cache RUN apk add --no-cache ca-certificates diff --git a/conf/buildDate b/conf/buildDate new file mode 100644 index 0000000..e69de29