Rename base directory to buildenv as discussed in #278

diff --git a/base/README b/base/README
deleted file mode 100644 (file)
index b411811..0000000
--- a/base/README
+++ /dev/null
@@ -1,7 +0,0 @@
-This directory contains base images, for building and testing.
-
-They have all the requirements needed, as per: doc/INSTALL.md
-
-Build them with "make docker BASE=ubuntu" after doing configure.
-
-You can also download them with "docker pull ccache/build:$BASE"

diff --git a/buildenv/README b/buildenv/README
new file mode 100644 (file)
index 0000000..07f0aab
--- /dev/null
+++ b/buildenv/README
@@ -0,0 +1,7 @@
+This directory contains base images, for building and testing.
+
+They have all the requirements needed, as per: doc/INSTALL.md
+
+Build them with "make docker BUILDENV=ubuntu" after doing configure.
+
+You can also download them with "docker pull ccache/build:$BUILDENV"

diff --git a/base/alpine/Dockerfile b/buildenv/alpine/Dockerfile
similarity index 100%
rename from base/alpine/Dockerfile
rename to buildenv/alpine/Dockerfile

diff --git a/base/centos/Dockerfile b/buildenv/centos/Dockerfile
similarity index 100%
rename from base/centos/Dockerfile
rename to buildenv/centos/Dockerfile

diff --git a/base/debian/Dockerfile b/buildenv/debian/Dockerfile
similarity index 100%
rename from base/debian/Dockerfile
rename to buildenv/debian/Dockerfile

diff --git a/base/fedora/Dockerfile b/buildenv/fedora/Dockerfile
similarity index 100%
rename from base/fedora/Dockerfile
rename to buildenv/fedora/Dockerfile

diff --git a/base/ubuntu/Dockerfile b/buildenv/ubuntu/Dockerfile
similarity index 100%
rename from base/ubuntu/Dockerfile
rename to buildenv/ubuntu/Dockerfile

diff --git a/dev.mk.in b/dev.mk.in
index 14306b23a9285a13c9149861d60d86f47fde24be..2f68f065c90a406649c628ca325058f206417a5a 100644 (file)
--- a/dev.mk.in
+++ b/dev.mk.in
@@ -235,13 +235,13 @@ analyze:
        $(SCAN_BUILD) --use-cc=$(CC) $(srcdir)/configure
        $(SCAN_BUILD) --use-cc=$(CC) --status-bugs $(MAKE) -B
 
-BASE=ubuntu
-TAG=ccache/build:$(BASE)
+BUILDENV = ubuntu
+DOCKER_IMAGE_TAG = ccache/build:$(BUILDENV)
 
 .PHONY: docker
-docker: base/$(BASE)/Dockerfile
-       $(DOCKER) inspect $(TAG) >/dev/null || $(DOCKER) build -t $(TAG) base/$(BASE)
-       $(DOCKER) run --rm -v $(PWD):/build -w /build $(TAG) misc/build.sh $(TEST)
+docker: buildenv/$(BUILDENV)/Dockerfile
+       $(DOCKER) inspect $(DOCKER_IMAGE_TAG) >/dev/null || $(DOCKER) build -t $(DOCKER_IMAGE_TAG) buildenv/$(BUILDENV)
+       $(DOCKER) run --rm -v $(PWD):/build -w /build $(DOCKER_IMAGE_TAG) misc/build.sh $(TEST)
 
 .PHONY: travis
 travis: .travis/Dockerfile