diff --git a/Dockerfile b/Dockerfile index 832ca06..8a2c341 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19-alpine +FROM ubuntu:22.10 ENV GO111MODULE=on ENV GOPROXY=https://goproxy.cn @@ -8,7 +8,7 @@ RUN mkdir -p /var/texas/data/ WORKDIR /var/texas COPY target/texas /var/texas/ -COPY target/config.toml /var/texas/data/ -COPY /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +COPY target/data/config.toml /var/texas/data/ +COPY target/data/localtime /etc/localtime -CMD ["/var/texas/texas"] +CMD ["./texas"] diff --git a/Makefile b/Makefile index a101402..298c33b 100644 --- a/Makefile +++ b/Makefile @@ -2,14 +2,16 @@ GOCMD=GO111MODULE=on go GOBUILD=$(GOCMD) build GOTEST=$(GOCMD) test - +VERSION=1.0.0 all: build build: - rm -rf target/texas target/data/config.toml + rm -rf target/texas target/data/config.toml target/data/localtime mkdir -p target/data/ cp data/config.toml target/data/config.toml $(GOBUILD) -o target/texas cmd/main.go + cp /usr/share/zoneinfo/Asia/Shanghai target/data/localtime + docker build -t texas:$(VERSION) . clean: rm -rf target/ @@ -20,3 +22,6 @@ run: stop: pkill -f target/texas +run_docker: + docker volume create texas-data + docker run -d --net host --name texas -v texas-data:/var/texas/data texas:$(VERSION)