unix: mount Docker-based builder at x/sys

mirror of https://github.com/rwinkhart/sys.git synced 2026-08-30 22:06:37 -04:00

Mount the data volume for the Docker-based builder at x/sys instead of
x/sys/unix.

The x/sys/go.mod file was not included in the data volume when mounting
x/sys/unix. This breaks module-aware go commands that run within the
Docker container.

Fix this problem by mounting the volume at x/sys and updating the
working directory of the builder accordingly.

Updates golang/go#49484

Change-Id: I2346b5320413b48de4984c9d9e31203941336357
Reviewed-on: https://go-review.googlesource.com/c/sys/+/363594
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
Reviewed-by: Tobias Klauser <tobias.klauser@gmail.com>
Trust: Bryan C. Mills <bcmills@google.com>

This commit is contained in:

Johan Jansson

2021-11-12 16:43:26 +00:00

committed by

Tobias Klauser

parent c6105e7cf7

commit 7c45f0c2c7

30 changed files with 30 additions and 30 deletions

									
										unix/linux/Dockerfile
									
		+1
		-1
	
												View File
												
				@@ -53,5 +53,5 @@ RUN apt-get update && apt-get install -y \

				# Let the scripts know they are in the docker environment

				ENV GOLANG_SYS_BUILD docker

				WORKDIR /build

				WORKDIR /build/unix

				ENTRYPOINT ["go", "run", "linux/mkall.go", "/git/linux", "/git/glibc"]