Skip to content

Commit b3c3604

Browse files
Re-add "Dockerfile" for base image in the root of our repository.
I've moved the "base" image Dockerfiles from the root to "/docker/base/" in vitessio#2769. This broke the automated build on Docker Hub because now it assumes "/docker/base" as build context and not "/" anymore. But "/" as build context is required to run "make build" and access the source code. Therefore, I'm re-adding "Dockerfile" as symlink pointing to "docker/base/Dockerfile". I'm also deleting "docker/base/README.md" again because I only added it for the automated build (it must be in the same directory as the "Dockerfile"). With the switch back to "/" as build context, it will use "/README.md" instead.
1 parent 00c7c2d commit b3c3604

File tree

3 files changed

+9
-30
lines changed

3 files changed

+9
-30
lines changed

Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
docker/base/Dockerfile

docker/base/Dockerfile

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# NOTE: This file is also symlinked as "Dockerfile" in the root of our
2+
# repository because the automated build feature on Docker Hub does not
3+
# allow to specify a different build context. It always assumes that the
4+
# build context is the same directory as the Dockerfile is in.
5+
# "make build" below must be called in our repository's root and
6+
# therefore we need to have the symlinked "Dockerfile" in there as well.
7+
# TODO(mberlin): Remove the symlink and this note once
8+
# https://github.com/docker/hub-feedback/issues/292 is fixed.
19
FROM vitess/bootstrap:mysql57
210

311
# Re-copy sources from working tree

docker/base/README.md

-30
This file was deleted.

0 commit comments

Comments
 (0)