This commit is contained in:
C菌
2022-04-28 15:50:11 +08:00
parent 94cd2ce218
commit f810b7bc91
4 changed files with 15 additions and 4 deletions

View File

@@ -1,4 +1,6 @@
FROM golang:latest as builder
FROM golang:alpine as builder
# RUN apt install -y git make
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && apk update && apk --no-cache add make git
LABEL anther="cjun"
WORKDIR /tinyurl
COPY . /tinyurl
@@ -9,10 +11,12 @@ RUN make build
FROM alpine:latest AS runner
# 设置alpine 时间为上海时间
RUN apk add tzdata && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && apk update && apk --no-cache add tzdata && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
&& echo "Asia/Shanghai" > /etc/timezone \
&& apk del tzdata
WORKDIR /app
COPY --from=builder /tinyurl/bin/tinyurl /app/tinyurl
COPY --from=builder /tinyurl/dist/ /app/dist/
COPY --from=builder /tinyurl/configs/ /app/configs/
EXPOSE 2830
CMD ["./tinyurl"]

File diff suppressed because one or more lines are too long

2
dist/index.html vendored
View File

@@ -5,7 +5,7 @@
<link rel="icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>TinyUrl</title>
<script type="module" crossorigin src="/assets/index.6bb8942b.js"></script>
<script type="module" crossorigin src="/assets/index.b2aedd95.js"></script>
<link rel="stylesheet" href="/assets/index.cf87a41a.css">
</head>
<body>

View File

@@ -20,6 +20,13 @@ LDFlags=" \
build:
mkdir -p bin/ && go build -ldflags $(LDFlags) -o ./bin/ ./...
.PHONY:buildx
buildx:
docker run --privileged --rm tonistiigi/binfmt --install all
docker buildx create --use --name xbuilder
docker buildx inspect xbuilder --bootstrap
docker buildx build --platform linux/amd64,linux/arm64 -t mirrors2/tinyurl:latest . --push
.PHONY: clean
# clean
clean: