update dockerfile and build script for build image

build/build-buildimages.sh

@@ -13,7 +13,6 @@ source $REPO_DIR/build/__variables.sh
 
 cd "$BUILD_IMAGES_BUILD_CONTEXT_DIR"
 
-declare BUILDSCRIPT_SOURCE="buildscriptbuilder"
 declare BUILD_SIGNED=""
 
 echo "SignType is: "$SIGNTYPE
@@ -22,12 +21,9 @@ echo "SignType is: "$SIGNTYPE
 if [ "$SIGNTYPE" == "real" ] || [ "$SIGNTYPE" == "Real" ]
 then
 # "SignType" will be real only for builds by scheduled and/or manual builds  of ORYX-CI
-    BUILDSCRIPT_SOURCE="copybuildscriptbinaries"
+    # BUILDSCRIPT_SOURCE="copybuildscriptbinaries"
 	BUILD_SIGNED="true"
 	ls -l $BUILD_IMAGES_BUILD_CONTEXT_DIR
-else
-# locally we need to fake "binaries" directory to get a successful "copybuildscriptbinaries" build stage
-    mkdir -p $BUILD_IMAGES_BUILD_CONTEXT_DIR/binaries
 fi
 
 # Avoid causing cache invalidation with the following check
@@ -60,14 +56,13 @@ BuildAndTagStage node-install
 BuildAndTagStage dotnet-install
 BuildAndTagStage python
 BuildAndTagStage buildscriptbuilder
-BuildAndTagStage copybuildscriptbinaries
+# BuildAndTagStage copybuildscriptbinaries
 BuildAndTagStage buildscriptbinaries
 
 builtImageTag="$DOCKER_BUILD_IMAGES_REPO:latest"
 docker build -t $builtImageTag \
 	--build-arg AI_KEY=$APPLICATION_INSIGHTS_INSTRUMENTATION_KEY \
 	--build-arg AGENTBUILD=$BUILD_SIGNED \
-	--build-arg BUILDSCRIPT_SOURCE=$BUILDSCRIPT_SOURCE \
 	$ctxArgs -f "$BUILD_IMAGES_DOCKERFILE" .
 
 echo

images/build/Dockerfile

@@ -1,5 +1,4 @@
 # Start declaration of Build-Arg to determine where the image is getting built (devops agents or local)
-ARG BUILDSCRIPT_SOURCE=buildscriptbuilder
 ARG AGENTBUILD
 FROM buildpack-deps:stretch AS main
 # End declaration of Build-Arg to determine where the image is getting built (devops agents or local)
@@ -265,17 +264,14 @@ ENV GIT_COMMIT=${GIT_COMMIT}
 ENV BUILD_NUMBER=${BUILD_NUMBER}
 RUN if [ -z "$AGENTBUILD" ]; then \
         dotnet publish -r linux-x64 -o /opt/buildscriptgen/ -c Release BuildScriptGeneratorCli/BuildScriptGeneratorCli.csproj; \
+    else \
+        cp -rf binaries/. /opt/buildscriptgen/; \
     fi
 
-# This stage is only when building in devops agents
-FROM main AS copybuildscriptbinaries
-COPY binaries /opt/buildscriptgen/
-
 # This stage copies oryx binaries from specific build stage, for local/dev it copies
 # from "buildscriptbuilder" and for devops it copies from "copybuildscriptbinaries"
 # https://github.com/moby/moby/issues/34482
-FROM ${BUILDSCRIPT_SOURCE} AS buildscriptbinaries
-ARG BUILDSCRIPT_SOURCE
+FROM buildscriptbuilder AS buildscriptbinaries
 WORKDIR /usr/oryx/src
 ARG GIT_COMMIT=unspecified
 ARG BUILD_NUMBER=unspecified

vsts/pipelines/ci.yml

@@ -49,6 +49,7 @@ jobs:
 
 - job: Job_RuntimeImages
   displayName: Build and Test Runtime Images
+  dependsOn: Job_SignBinaries
   condition: succeeded()
   pool:
     name: OryxLinux