Skip to content

Commit b446d91

Browse files
committed
build: update Dockerfile and CI workflow
- Update Dockerfile and build.dockerfile to use golang:1.23.8 as golang-builder - Copy current directory instead of $PWD in Dockerfile - Update CI workflow to include golang-ci step (commented out) - Remove unused DOCKER_CLI_VERSION argument
1 parent a72d1d2 commit b446d91

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ jobs:
8383
# name: docker-bake-basic-all-latest
8484
# needs:
8585
# - version
86+
# - golang-ci
8687
# - go-goreleaser-dry-run
8788
# uses: ./.github/workflows/docker-buildx-bake-hubdocker-latest.yml
8889
# if: ${{ github.ref_type != 'tag' }}
@@ -97,6 +98,7 @@ jobs:
9798
# name: docker-bake-multi-basic-all-latest
9899
# needs:
99100
# - version
101+
# - golang-ci
100102
# - go-goreleaser-dry-run
101103
# uses: ./.github/workflows/docker-buildx-bake-multi-latest.yml
102104
# if: ${{ github.ref_type != 'tag' }}
@@ -115,6 +117,7 @@ jobs:
115117
# name: docker-bake-basic-all-tag
116118
# needs:
117119
# - version
120+
# - golang-ci
118121
# uses: ./.github/workflows/docker-buildx-bake-hubdocker-tag.yml
119122
# if: startsWith(github.ref, 'refs/tags/')
120123
# with:
@@ -128,6 +131,7 @@ jobs:
128131
# name: docker-bake-multi-basic-all-tag
129132
# needs:
130133
# - version
134+
# - golang-ci
131135
# uses: ./.github/workflows/docker-buildx-bake-multi-tag.yml
132136
# if: startsWith(github.ref, 'refs/tags/')
133137
# with:

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Author: bridgewwater
44
# dockerfile official document https://docs.docker.com/engine/reference/builder/
55
# https://hub.docker.com/_/golang
6-
FROM golang:1.23.8 as builder
6+
FROM golang:1.23.8 AS golang-builder
77

88
ARG GO_ENV_PACKAGE_NAME=github.com/bridgewwater/temp-golang-cli-fast
99
ARG GO_ENV_ROOT_BUILD_BIN_NAME=temp-golang-cli-fast
@@ -14,7 +14,7 @@ ARG GO_PATH_SOURCE_DIR=/go/src
1414
WORKDIR ${GO_PATH_SOURCE_DIR}
1515

1616
RUN mkdir -p ${GO_PATH_SOURCE_DIR}/${GO_ENV_PACKAGE_NAME}
17-
COPY $PWD ${GO_PATH_SOURCE_DIR}/${GO_ENV_PACKAGE_NAME}
17+
COPY . ${GO_PATH_SOURCE_DIR}/${GO_ENV_PACKAGE_NAME}
1818

1919
RUN cd ${GO_PATH_SOURCE_DIR}/${GO_ENV_PACKAGE_NAME} && \
2020
go mod download -x
@@ -32,7 +32,7 @@ RUN cd ${GO_PATH_SOURCE_DIR}/${GO_ENV_PACKAGE_NAME} && \
3232
# https://hub.docker.com/_/alpine
3333
FROM alpine:3.17
3434

35-
ARG DOCKER_CLI_VERSION=${DOCKER_CLI_VERSION}
35+
#ARG DOCKER_CLI_VERSION=${DOCKER_CLI_VERSION}
3636
ARG GO_ENV_PACKAGE_NAME=github.com/bridgewwater/temp-golang-cli-fast
3737
ARG GO_ENV_ROOT_BUILD_BIN_NAME=temp-golang-cli-fast
3838
ARG GO_ENV_ROOT_BUILD_BIN_PATH=build/${GO_ENV_ROOT_BUILD_BIN_NAME}
@@ -46,6 +46,6 @@ ARG GO_PATH_SOURCE_DIR=/go/src
4646
RUN mkdir /app
4747
WORKDIR /app
4848

49-
COPY --from=builder ${GO_PATH_SOURCE_DIR}/${GO_ENV_PACKAGE_NAME}/${GO_ENV_ROOT_BUILD_BIN_PATH} .
49+
COPY --from=golang-builder ${GO_PATH_SOURCE_DIR}/${GO_ENV_PACKAGE_NAME}/${GO_ENV_ROOT_BUILD_BIN_PATH} .
5050
ENTRYPOINT [ "/app/temp-golang-cli-fast" ]
5151
# CMD ["/app/temp-golang-cli-fast", "--help"]

build.dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Author: bridgewwater
44
# dockerfile official document https://docs.docker.com/engine/reference/builder/
55
# https://hub.docker.com/_/golang
6-
FROM golang:1.23.8 as builder
6+
FROM golang:1.23.8 AS golang-builder
77

88
ARG GO_ENV_PACKAGE_NAME=github.com/bridgewwater/temp-golang-cli-fast
99
ARG GO_ENV_ROOT_BUILD_BIN_NAME=temp-golang-cli-fast
@@ -14,7 +14,7 @@ ARG GO_PATH_SOURCE_DIR=/go/src
1414
WORKDIR ${GO_PATH_SOURCE_DIR}
1515

1616
RUN mkdir -p ${GO_PATH_SOURCE_DIR}/${GO_ENV_PACKAGE_NAME}
17-
COPY $PWD ${GO_PATH_SOURCE_DIR}/${GO_ENV_PACKAGE_NAME}
17+
COPY . ${GO_PATH_SOURCE_DIR}/${GO_ENV_PACKAGE_NAME}
1818

1919
# proxy golang
2020
RUN go env -w "GOPROXY=https://goproxy.cn,direct"
@@ -36,7 +36,7 @@ RUN cd ${GO_PATH_SOURCE_DIR}/${GO_ENV_PACKAGE_NAME} && \
3636
# https://hub.docker.com/_/alpine
3737
FROM alpine:3.17
3838

39-
ARG DOCKER_CLI_VERSION=${DOCKER_CLI_VERSION}
39+
#ARG DOCKER_CLI_VERSION=${DOCKER_CLI_VERSION}
4040
ARG GO_ENV_PACKAGE_NAME=github.com/bridgewwater/temp-golang-cli-fast
4141
ARG GO_ENV_ROOT_BUILD_BIN_NAME=temp-golang-cli-fast
4242
ARG GO_ENV_ROOT_BUILD_BIN_PATH=build/${GO_ENV_ROOT_BUILD_BIN_NAME}
@@ -50,6 +50,6 @@ ARG GO_PATH_SOURCE_DIR=/go/src
5050
RUN mkdir /app
5151
WORKDIR /app
5252

53-
COPY --from=builder ${GO_PATH_SOURCE_DIR}/${GO_ENV_PACKAGE_NAME}/${GO_ENV_ROOT_BUILD_BIN_PATH} .
53+
COPY --from=golang-builder ${GO_PATH_SOURCE_DIR}/${GO_ENV_PACKAGE_NAME}/${GO_ENV_ROOT_BUILD_BIN_PATH} .
5454
ENTRYPOINT [ "/app/temp-golang-cli-fast" ]
5555
# CMD ["/app/temp-golang-cli-fast", "--help"]

0 commit comments

Comments
 (0)