Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
3d9b9ae5d6
1 changed files with 3 additions and 5 deletions
|
@ -1,4 +1,4 @@
|
||||||
FROM golang:1.17.7-alpine as cloudreve_builder
|
FROM golang:1.17-alpine as cloudreve_builder
|
||||||
|
|
||||||
|
|
||||||
# install dependencies and build tools
|
# install dependencies and build tools
|
||||||
|
@ -10,13 +10,11 @@ RUN git clone --recurse-submodules https://github.com/cloudreve/Cloudreve.git
|
||||||
# build frontend
|
# build frontend
|
||||||
WORKDIR /cloudreve_builder/Cloudreve/assets
|
WORKDIR /cloudreve_builder/Cloudreve/assets
|
||||||
RUN yarn install --network-timeout 1000000
|
RUN yarn install --network-timeout 1000000
|
||||||
RUN yarn run build
|
RUN yarn run build && rm -rf build/*.map
|
||||||
|
|
||||||
# build backend
|
# build backend
|
||||||
WORKDIR /cloudreve_builder/Cloudreve
|
WORKDIR /cloudreve_builder/Cloudreve
|
||||||
RUN go get github.com/rakyll/statik \
|
RUN tag_name=$(git describe --tags) \
|
||||||
&& statik -src=assets/build/ -include=*.html,*.js,*.json,*.css,*.png,*.svg,*.ico -f \
|
|
||||||
&& tag_name=$(git describe --tags) \
|
|
||||||
&& export COMMIT_SHA=$(git rev-parse --short HEAD) \
|
&& export COMMIT_SHA=$(git rev-parse --short HEAD) \
|
||||||
&& go build -a -o cloudreve -ldflags " -X 'github.com/HFO4/cloudreve/pkg/conf.BackendVersion=$tag_name' -X 'github.com/HFO4/cloudreve/pkg/conf.LastCommit=$COMMIT_SHA'"
|
&& go build -a -o cloudreve -ldflags " -X 'github.com/HFO4/cloudreve/pkg/conf.BackendVersion=$tag_name' -X 'github.com/HFO4/cloudreve/pkg/conf.LastCommit=$COMMIT_SHA'"
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue