update
This commit is contained in:
@@ -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"
|
LABEL anther="cjun"
|
||||||
WORKDIR /tinyurl
|
WORKDIR /tinyurl
|
||||||
COPY . /tinyurl
|
COPY . /tinyurl
|
||||||
@@ -9,10 +11,12 @@ RUN make build
|
|||||||
|
|
||||||
FROM alpine:latest AS runner
|
FROM alpine:latest AS runner
|
||||||
# 设置alpine 时间为上海时间
|
# 设置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 \
|
&& echo "Asia/Shanghai" > /etc/timezone \
|
||||||
&& apk del tzdata
|
&& apk del tzdata
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY --from=builder /tinyurl/bin/tinyurl /app/tinyurl
|
COPY --from=builder /tinyurl/bin/tinyurl /app/tinyurl
|
||||||
|
COPY --from=builder /tinyurl/dist/ /app/dist/
|
||||||
|
COPY --from=builder /tinyurl/configs/ /app/configs/
|
||||||
EXPOSE 2830
|
EXPOSE 2830
|
||||||
CMD ["./tinyurl"]
|
CMD ["./tinyurl"]
|
||||||
File diff suppressed because one or more lines are too long
2
dist/index.html
vendored
2
dist/index.html
vendored
@@ -5,7 +5,7 @@
|
|||||||
<link rel="icon" href="/favicon.ico" />
|
<link rel="icon" href="/favicon.ico" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
<title>TinyUrl</title>
|
<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">
|
<link rel="stylesheet" href="/assets/index.cf87a41a.css">
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|||||||
7
makefile
7
makefile
@@ -20,6 +20,13 @@ LDFlags=" \
|
|||||||
build:
|
build:
|
||||||
mkdir -p bin/ && go build -ldflags $(LDFlags) -o ./bin/ ./...
|
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
|
.PHONY: clean
|
||||||
# clean
|
# clean
|
||||||
clean:
|
clean:
|
||||||
|
|||||||
Reference in New Issue
Block a user