From c12d982a2dada8296d91f62d0755bf3981c5cd3b Mon Sep 17 00:00:00 2001 From: tangmingyou <234767776@qq.com> Date: Mon, 27 Feb 2023 16:49:01 +0800 Subject: [PATCH] build test --- Dockerfile | 7 +++++-- Makefile | 5 ++--- data/config.toml | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8a2c341..15010eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,17 @@ +# alpine need CGO_ENABLED=0, sqlite need CGO_ENABLED=1 ... FROM ubuntu:22.10 ENV GO111MODULE=on ENV GOPROXY=https://goproxy.cn +ENV LANG C.UTF-8 -RUN mkdir -p /var/texas/data/ +RUN mkdir -p /var/texas/data/ \ + && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ + && echo 'Asia/Shanghai' > /etc/timezone WORKDIR /var/texas COPY target/texas /var/texas/ COPY target/data/config.toml /var/texas/data/ -COPY target/data/localtime /etc/localtime CMD ["./texas"] diff --git a/Makefile b/Makefile index 298c33b..f279784 100644 --- a/Makefile +++ b/Makefile @@ -6,11 +6,10 @@ VERSION=1.0.0 all: build build: - rm -rf target/texas target/data/config.toml target/data/localtime + rm -rf target/texas target/data/config.toml mkdir -p target/data/ - cp data/config.toml target/data/config.toml + cp data/config.toml target/data/ $(GOBUILD) -o target/texas cmd/main.go - cp /usr/share/zoneinfo/Asia/Shanghai target/data/localtime docker build -t texas:$(VERSION) . clean: diff --git a/data/config.toml b/data/config.toml index 0578ad2..2f1213e 100644 --- a/data/config.toml +++ b/data/config.toml @@ -1,7 +1,7 @@ [http] host = "" -port = 9999 +port = 3999 [auth] aesTokenKey = "9Nz3Y6DES3msAFndz4QsJAECUIFkf+KKaRa+jRnNALk="