Skip to content

Commit 4d50f8d

Browse files
committed
fix docker build
Signed-off-by: Bo-Yi Wu <[email protected]>
1 parent 81ffbc1 commit 4d50f8d

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ else
3535
endif
3636

3737
.PHONY: all
38-
all: build
38+
all: clean assets generate build
3939

4040
.PHONY: clean
4141
clean:
@@ -126,7 +126,7 @@ $(EXECUTABLE): $(SOURCES)
126126

127127
.PHONY: docker
128128
docker:
129-
docker run -ti --rm -v $(CURDIR):/srv/app/src/code.gitea.io/gitea -w /srv/app/src/code.gitea.io/gitea -e TAGS="bindata $(TAGS)" webhippie/golang:edge make clean generate build
129+
docker run -ti --rm -v $(CURDIR):/srv/app/src/code.gitea.io/gitea -w /srv/app/src/code.gitea.io/gitea -e TAGS="bindata $(TAGS)" webhippie/golang:edge make clean assets generate build
130130
docker build -t $(DOCKER_TAG) .
131131

132132
.PHONY: release
@@ -195,9 +195,9 @@ public/css/index.css: $(STYLESHEETS)
195195
.PHONY: swagger-ui
196196
swagger-ui:
197197
rm -rf public/assets/swagger-ui
198-
git clone --depth=10 -b v3.0.7 --single-branch https://github.com/swagger-api/swagger-ui.git /tmp/swagger-ui
199-
mv /tmp/swagger-ui/dist public/assets/swagger-ui
200-
rm -rf /tmp/swagger-ui
198+
git clone --depth=10 -b v3.0.7 --single-branch https://github.com/swagger-api/swagger-ui.git $(TMPDIR)/swagger-ui
199+
mv $(TMPDIR)/swagger-ui/dist public/assets/swagger-ui
200+
rm -rf $(TMPDIR)/swagger-ui
201201
sed -i "s;http://petstore.swagger.io/v2/swagger.json;../../swagger.v1.json;g" public/assets/swagger-ui/index.html
202202

203203
.PHONY: assets

0 commit comments

Comments
 (0)