diff --git a/.dockerignore b/.dockerignore index faaecfe365..6f1052078d 100644 --- a/.dockerignore +++ b/.dockerignore @@ -8,3 +8,5 @@ ! test/test-config.sh ! hack/copy-modules-license.sh ! vendor/** +! go.mod +! go.sum diff --git a/Dockerfile b/Dockerfile index 83ad8c3355..effb5fe3a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ ARG SWUPD_UPDATE_ARG ARG NDCTL_VERSION="67" ARG NDCTL_CONFIGFLAGS="--disable-docs --without-systemd --without-bash" ARG NDCTL_BUILD_DEPS="os-core-dev devpkg-util-linux devpkg-kmod devpkg-json-c" -ARG GO_VERSION="1.12.9" +ARG GO_VERSION="1.13.4" #pull dependencies required for downloading and building libndctl ARG CACHEBUST @@ -78,11 +78,9 @@ FROM build as binaries # build pmem-csi-driver ARG VERSION="unknown" -# Beware that this copying is filtered with .dockerignore! -ADD . /go/src/github.com/intel/pmem-csi -ENV GOPATH=/go +ADD . /src/pmem-csi ENV PKG_CONFIG_PATH=/usr/lib/pkgconfig/ -WORKDIR /go/src/github.com/intel/pmem-csi +WORKDIR /src/pmem-csi ARG BIN_SUFFIX # Here we choose explicitly which binaries we want in the image and in # which flavor (production or testing). The actual binary name in the diff --git a/Jenkinsfile b/Jenkinsfile index 69044661f3..adfde0cae0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -48,7 +48,8 @@ pipeline { /* last version before the 1.14 update in 28630 */ CLEAR_LINUX_VERSION_1_13 = "28620" - PMEM_PATH = "/go/src/github.com/intel/pmem-csi" + // path for placing the source to build outside of GOROOT + PMEM_PATH = "/src/pmem-csi" REGISTRY_NAME = "cloud-native-image-registry.westus.cloudapp.azure.com" // Per-branch build environment, marked as "do not promote to public registry".