Use our own scripts and Makefiles

Instead of using Makefile.inc and the scripts from the image, use our local versions. Signed-off-by: Stephen Kitt <[email protected]>
dfarrell07 · Nov 3, 2020 · 205800e · 205800e
1 parent a015f19
commit 205800e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Dockerfile.dapper b/Dockerfile.dapper
@@ -2,7 +2,7 @@ FROM quay.io/submariner/shipyard-dapper-base:devel
 
 ENV DAPPER_ENV="REPO TAG QUAY_USERNAME QUAY_PASSWORD TRAVIS_COMMIT GITHUB_SHA CLUSTERS_ARGS DEPLOY_ARGS E2E_ARGS RELEASE_ARGS" \
     DAPPER_SOURCE=/go/src/github.com/submariner-io/shipyard DAPPER_DOCKER_SOCKET=true
-ENV DAPPER_OUTPUT=${DAPPER_SOURCE}/output
+ENV DAPPER_OUTPUT=${DAPPER_SOURCE}/output SCRIPTS_DIR=${DAPPER_SOURCE}/scripts/shared
 
 WORKDIR ${DAPPER_SOURCE}
 

diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ override CLUSTERS_ARGS += $(CLUSTER_SETTINGS_FLAG)
 override DEPLOY_ARGS += $(CLUSTER_SETTINGS_FLAG)
 override E2E_ARGS += $(CLUSTER_SETTINGS_FLAG) --nolazy_deploy cluster1
 
-include $(SHIPYARD_DIR)/Makefile.inc
+include Makefile.inc
 
 TARGETS := $(shell ls -p scripts | grep -v -e /)