Merge pull request #124 from nkubala/staging_image

rename FULL_BASE_IMAGE to STAGING_IMAGE to match integration test fra…

Author: nkubala

build.sh

@@ -108,8 +108,8 @@ fi
 
 # Use latest released Debian as our base image
 export DEBIAN_BASE_IMAGE="gcr.io/google-appengine/debian8:latest"
-export FULL_BASE_IMAGE="${DOCKER_NAMESPACE}/python:${TAG}"
-echo "Using base image name ${FULL_BASE_IMAGE}"
+export STAGING_IMAGE="${DOCKER_NAMESPACE}/python:${TAG}"
+echo "Using base image name ${STAGING_IMAGE}"
 
 # Generate Dockerfiles
 for outfile in \
@@ -120,7 +120,7 @@ for outfile in \
   tests/google-cloud-python-system/Dockerfile \
   tests/integration/Dockerfile \
   ; do
-  envsubst <"${outfile}".in >"${outfile}" '$DEBIAN_BASE_IMAGE $FULL_BASE_IMAGE $GOOGLE_CLOUD_PROJECT_FOR_TESTS'
+  envsubst <"${outfile}".in >"${outfile}" '$DEBIAN_BASE_IMAGE $STAGING_IMAGE $GOOGLE_CLOUD_PROJECT_FOR_TESTS'
 done
 
 # Build images and push to GCR

tests/benchmark/Dockerfile.in

@@ -1,4 +1,4 @@
-FROM ${FULL_BASE_IMAGE}
+FROM ${STAGING_IMAGE}
 
 # Install performance
 RUN pip install performance

tests/benchmark/benchmark_between_releases.sh

@@ -2,15 +2,15 @@
 
 # Build the benchmark image for release 1 from Dockerfile
 echo "Building image for release 1"
-export FULL_BASE_IMAGE="${DOCKER_NAMESPACE}/python:${TAG1}"
-envsubst <"Dockerfile".in >"Dockerfile" '$FULL_BASE_IMAGE'
+export STAGING_IMAGE="${DOCKER_NAMESPACE}/python:${TAG1}"
+envsubst <"Dockerfile".in >"Dockerfile" '$STAGING_IMAGE'
 docker build --no-cache -t benchmark_1 .
 rm Dockerfile
 
 # Build the benchmark image for release 2 from Dockerfile
 echo "Building image for release 2"
-export FULL_BASE_IMAGE="${DOCKER_NAMESPACE}/python:${TAG2}"
-envsubst <"Dockerfile".in >"Dockerfile" '$FULL_BASE_IMAGE'
+export STAGING_IMAGE="${DOCKER_NAMESPACE}/python:${TAG2}"
+envsubst <"Dockerfile".in >"Dockerfile" '$STAGING_IMAGE'
 docker build --no-cache -t benchmark_2 .
 rm Dockerfile
 

tests/google-cloud-python-system/Dockerfile.in

@@ -1,4 +1,4 @@
-FROM ${FULL_BASE_IMAGE}
+FROM ${STAGING_IMAGE}
 
 # Get the source.
 RUN git clone --depth 1 https://github.com/GoogleCloudPlatform/google-cloud-python.git

tests/google-cloud-python/Dockerfile.in

@@ -1,4 +1,4 @@
-FROM ${FULL_BASE_IMAGE}
+FROM ${STAGING_IMAGE}
 
 # Get the source.
 RUN git clone --depth 1 https://github.com/GoogleCloudPlatform/google-cloud-python.git

tests/integration/Dockerfile.in

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ${FULL_BASE_IMAGE}
+FROM ${STAGING_IMAGE}
 
 COPY . /app
 WORKDIR /app