From 6c7f7de55f0ea63cfe09a535e3cf45dcb44e00ce Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 18 Mar 2020 12:57:38 -0700 Subject: [PATCH] Don't run make generate for gitea Upstream stopped running make generate in order to fix their static file builds [0]. Our static file builds have stopped working with our bump to 1.11.3. Apply the corresponding fix to our dockerfile. Note that we also use clean-all instead of clean to be sure we clean all the js and css files first. [0] https://github.com/go-gitea/gitea/commit/48be1889cd0f0419cfdfb2ad54542e8dd3bbb5f4#diff-3254677a7917c6c01f55212f86c57fbf Change-Id: I40f0449ae29e185ba7082f2f5a27dc96acf58e31 --- docker/gitea/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/gitea/Dockerfile b/docker/gitea/Dockerfile index ab8ec2cc02..55f1a1173f 100644 --- a/docker/gitea/Dockerfile +++ b/docker/gitea/Dockerfile @@ -43,7 +43,7 @@ WORKDIR ${GOPATH}/src/code.gitea.io/gitea #Checkout version if set RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \ - && make clean generate build + && make clean-all build ################################### # Basic system setup common to all containers in our pod