Skip to content

Commit 4632462

Browse files
committed
Add: 增加makefile,优化Dockerfile
1 parent ebc7a29 commit 4632462

File tree

2 files changed

+32
-5
lines changed

2 files changed

+32
-5
lines changed

Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# 使用最新的Ubuntu作为基础镜像
2-
FROM golang:latest
2+
FROM ubuntu:latest
33

44
# 设置工作目录
55
WORKDIR /app
@@ -8,9 +8,9 @@ WORKDIR /app
88
COPY . /app
99

1010
# 编译Go代码
11-
RUN go env -w GOPROXY=https://goproxy.io
12-
RUN go mod tidy
13-
RUN go build -o myapp
11+
# RUN go env -w GOPROXY=https://goproxy.io
12+
# RUN go mod tidy
13+
# RUN go build -o myapp
1414

1515
# 设置容器启动时执行的命令
16-
ENTRYPOINT ["/app/myapp"]
16+
ENTRYPOINT ["/app/QR-code-go"]

Makefile

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# 定义Go编译器和构建标志
2+
GOCMD=go
3+
GOBUILD=$(GOCMD) build -o myapp .
4+
5+
# 定义Docker相关变量
6+
IMAGE_NAME=my-go-app
7+
DOCKERFILE=Dockerfile
8+
9+
# 编译Go项目
10+
build:
11+
$(GOBUILD)
12+
13+
# 清理构建的文件(可选)
14+
clean:
15+
$(GOCMD) clean -i -cache -modcache
16+
rm -f myapp
17+
18+
# 构建Docker镜像
19+
image:
20+
docker build -t $(IMAGE_NAME) -f $(DOCKERFILE) .
21+
22+
# 运行Docker容器(仅用于测试,可选)
23+
run:
24+
docker run --rm -it -p 8080:8080 $(IMAGE_NAME)
25+
26+
# 完整的构建和打包流程(包含编译和打包Docker镜像)
27+
all: clean build image

0 commit comments

Comments
 (0)