From 28ed763f5520158bfaacc188ad47627c4bab4b5b Mon Sep 17 00:00:00 2001 From: Giteabot Date: Tue, 20 Jun 2023 02:52:38 -0400 Subject: [PATCH] Use Actions git context instead of dynamically created buildkit one (#25381) (#25383) Backport #25381 by @techknowlogick The [docker/build-push-action@v2 action](https://github.com/docker/build-push-action) by default ignores the checkout created using the actions/checkout@v2 action. When you pass a git build context to docker build, it wouldn't include the .git directory. By passing `context: .` to the build step then it'll use the Actions git context which includes the git fetch from the earlier step. Co-authored-by: techknowlogick --- .github/workflows/release-nightly.yml | 2 ++ Makefile | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml index 1868673f17..0e94f5217c 100644 --- a/.github/workflows/release-nightly.yml +++ b/.github/workflows/release-nightly.yml @@ -78,12 +78,14 @@ jobs: - name: build rootful docker image uses: docker/build-push-action@v4 with: + context: . platforms: linux/amd64,linux/arm64 push: true tags: gitea/gitea:${{ steps.clean_name.outputs.branch }} - name: build rootless docker image uses: docker/build-push-action@v4 with: + context: . platforms: linux/amd64,linux/arm64 push: true file: Dockerfile.rootless diff --git a/Makefile b/Makefile index ecd7a2d80c..9543fd2d9a 100644 --- a/Makefile +++ b/Makefile @@ -1001,9 +1001,5 @@ docker: docker build --disable-content-trust=false -t $(DOCKER_REF) . # support also build args docker build --build-arg GITEA_VERSION=v1.2.3 --build-arg TAGS="bindata sqlite sqlite_unlock_notify" . -.PHONY: docker-build -docker-build: - 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)" LDFLAGS="$(LDFLAGS)" CGO_EXTRA_CFLAGS="$(CGO_EXTRA_CFLAGS)" webhippie/golang:edge make clean build - # This endif closes the if at the top of the file endif