Skip to content

Commit 74f3d25

Browse files
committed
fix: docker file
1 parent f193166 commit 74f3d25

File tree

4 files changed

+37
-21
lines changed

4 files changed

+37
-21
lines changed

docker/1.6.0/Dockerfile.base

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
FROM node:17-alpine3.14 AS Builder
2-
ENV LANG en_US.UTF-8
3-
ENV LANGUAGE en_US.UTF-8
4-
ENV LC_ALL=en_US.UTF-8
5-
RUN apk add curl
1+
FROM --platform=$BUILDPLATFORM node:17-alpine3.14 AS builder
2+
ENV LANG="en_US.UTF-8"
3+
ENV LANGUAGE="en_US.UTF-8"
4+
ENV LC_ALL="en_US.UTF-8"
5+
RUN apk add --no-cache curl unzip
66
ARG VER_APP 1.6.0
77
ENV VER $VER_APP
88
RUN curl -L "https://github.com/doocs/md/archive/refs/tags/v$VER.zip" -o "v$VER.zip" && unzip "v$VER.zip" && mv "md-$VER" /app
99
WORKDIR /app
1010
COPY ./patch/vue.config.js /app/vue.config.js
1111
COPY ./patch/mm.config.js /app/mm/mm.config.js
12-
ENV NODE_OPTIONS=--openssl-legacy-provider
12+
ENV NODE_OPTIONS="--openssl-legacy-provider"
1313
RUN npm i && npm run build
1414

1515
FROM scratch
16-
LABEL MAINTAINER yanglbme<[email protected]>
17-
COPY --from=Builder /app/dist /app/assets
16+
LABEL MAINTAINER="ylb<[email protected]>"
17+
COPY --from=builder /app/dist /app/assets

docker/1.6.0/Dockerfile.nginx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG VER_APP=1.6.0
2-
ARG VER_NGX=1.21.6-alpine
2+
ARG VER_NGX="1.21.6-alpine"
33

4-
FROM "doocs/md:$VER_APP-assets" AS Assets
5-
FROM "nginx:$VER_NGX"
6-
LABEL MAINTAINER yanglbme<[email protected]>
7-
COPY --from=Assets /app/* /usr/share/nginx/html
4+
FROM --platform=$BUILDPLATFORM doocs/md:$VER_APP-assets AS assets
5+
FROM --platform=$TARGETPLATFORM nginx:${VER_NGX}
6+
LABEL MAINTAINER="ylb<[email protected]>"
7+
COPY --from=assets /app /usr/share/nginx/html

docker/1.6.0/Dockerfile.standalone

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,22 @@ ARG VER_APP=1.6.0
22
ARG VER_GOLANG=1.17.6-alpine3.15
33
ARG VER_ALPINE=3.15
44

5-
FROM "doocs/md:$VER_APP-assets" AS Assets
5+
FROM --platform=$BUILDPLATFORM "doocs/md:$VER_APP-assets" AS assets
66

7-
FROM "golang:$VER_GOLANG" AS GoBuilder
8-
COPY --from=Assets /app/* /app/assets/
7+
FROM --platform=$BUILDPLATFORM "golang:$VER_GOLANG" AS gobuilder
8+
ARG TARGETARCH
9+
ARG TARGETOS
10+
COPY --from=assets /app/* /app/assets/
911
COPY server/main.go /app
1012
RUN apk add git bash gcc musl-dev upx
1113
WORKDIR /app
14+
ENV GOOS=$TARGETOS GOARCH=$TARGETARCH
1215
RUN go build -ldflags "-w -s" -o md main.go && \
1316
apk add upx && \
14-
upx -9 -o md.minify md
17+
if [ "$TARGETARCH" = "amd64" ]; then upx -9 -o md.minify md; else cp md md.minify; fi
1518

16-
FROM "alpine:$VER_ALPINE"
17-
LABEL MAINTAINER yanglbme<[email protected]>
18-
COPY --from=GoBuilder /app/md.minify /bin/md
19+
FROM --platform=$TARGETPLATFORM "alpine:$VER_ALPINE"
20+
LABEL MAINTAINER="ylb<[email protected]>"
21+
COPY --from=gobuilder /app/md.minify /bin/md
1922
EXPOSE 80
20-
CMD ["md"]
23+
CMD ["md"]

docker/1.6.0/Dockerfile.static

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
ARG VER_APP=1.6.0
2+
FROM --platform=$BUILDPLATFORM "doocs/md:$VER_APP-assets" AS assets
3+
4+
# detail https://github.com/lipanski/docker-static-website/blob/master/Dockerfile
5+
FROM --platform=$TARGETPLATFORM lipanski/docker-static-website
6+
7+
WORKDIR /home/static
8+
9+
COPY --from=assets /app /home/static
10+
11+
EXPOSE 80
12+
13+
CMD ["/busybox-httpd", "-f", "-v", "-p", "80", "-c", "httpd.conf"]

0 commit comments

Comments
 (0)