Bug fix: If the organization is specified, it has to be used in the FROM clause for Dockerfile-academy-all

Author: Dean Wampler

Makefile

@@ -48,6 +48,7 @@ $(IMAGE_NAMES:%=%-image): echo
 	docker build \
 		$(DOCKER_TAGS:%=--tag $(ORGANIZATION)/${@:%-image=%}:%) \
 		--build-arg VERSION=$(ACADEMY_VERSION) \
+		--build-arg ORGANIZATION=$(ORGANIZATION) \
 		-f $(DOCKERFILE_BASE)-${@:%-image=%} stage
 
 stage-base: stage/academy-base

docker/Dockerfile-academy-all

@@ -1,6 +1,8 @@
-FROM deanwampler/academy-base:latest
+ARG VERSION
+ARG ORGANIZATION
+FROM ${ORGANIZATION}/academy-base:${VERSION}
 ARG VERSION
 LABEL maintainer="Anyscale Academy <[email protected]>"
 
-ADD academy-all/academy-$VERSION       /root/academy-$VERSION
-RUN ls -al /root/academy-$VERSION
+ADD academy-all/academy-${VERSION}       /root/academy-${VERSION}
+RUN ls -al /root/academy-${VERSION}

docker/Dockerfile-academy-base

@@ -1,5 +1,6 @@
 FROM anyscale/ray:0.8.7
 ARG VERSION
+ARG ORGANIZATION
 LABEL maintainer="Anyscale Academy <[email protected]>"
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]