X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fcaas-danm.git;a=blobdiff_plain;f=docker-build%2Fcni-builder%2FDockerfile;fp=docker-build%2Fcni-builder%2FDockerfile;h=a9d13e8f65de3f3bef80fc6b164f8807c05d5440;hp=c00d157331753d4ee892e4ec715986574fe8cf2a;hb=b2946a88e4058633ad18df1abddf5be1d247070c;hpb=d45b4117f30f9ad842c24f0c7c9fd8524a7f358f

diff --git a/docker-build/cni-builder/Dockerfile b/docker-build/cni-builder/Dockerfile
index c00d157..a9d13e8 100644
--- a/docker-build/cni-builder/Dockerfile
+++ b/docker-build/cni-builder/Dockerfile
@@ -15,19 +15,16 @@
 FROM centos:7.6.1810
 MAINTAINER Krisztian Lengyel <krisztian.lengyel@nokia.com>
 
-ARG DANM_VERSION
 ARG SRIOV_VERSION
 ARG go_version
 ARG binaries
 ENV GOPATH /go
 ARG go_install_dir="/usr/local/go"
 ARG glide_install_dir="/usr/local/glide"
-ENV PATH $GOPATH/bin:$go_install_dir/bin:$glide_install_dir:$PATH
+ENV PATH="$GOPATH/bin:$go_install_dir/bin:$glide_install_dir:$PATH"
 ENV CGO_ENABLED=0
 ENV GOOS=linux
-ARG code_generator_version="kubernetes-1.13.4"
-ARG build_packages="gcc gcc-c++ glibc-devel make autoconf git which libtool"
-ARG danm_dependencies="iptables socat grep findutils curl conntrack-tools iputils"
+ARG build_packages="gcc gcc-c++ glibc-devel make autoconf git which libtool curl"
 
 WORKDIR /
 
@@ -46,43 +43,19 @@ RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.n
 &&  glide_version="$(curl -sSLf https://glide.sh/version)" \
 &&  mkdir -p ${glide_install_dir} \
 &&  curl -fsSL https://github.com/Masterminds/glide/releases/download/${glide_version}/glide-${glide_version}-linux-amd64.tar.gz | tar zx --strip-components=1 -C ${glide_install_dir} \
-&&  mkdir -p $GOPATH/src/github.com/nokia \
-&&  git clone https://github.com/nokia/danm.git $GOPATH/src/github.com/nokia/danm \
-&&  cd $GOPATH/src/github.com/nokia/danm \
-&&  git fetch --tags \
-&&  git checkout ${DANM_VERSION} \
-&&  glide install --strip-vendor \
-&&  go get -d github.com/vishvananda/netlink \
-&&  go get github.com/containernetworking/plugins/pkg/ns \
-&&  go get github.com/golang/groupcache/lru \
-&&  rm -rf $GOPATH/src/k8s.io/code-generator \
-&&  git clone -b ${code_generator_version} --depth 1 https://github.com/kubernetes/code-generator.git $GOPATH/src/k8s.io/code-generator \
-&&  go install k8s.io/code-generator/cmd/deepcopy-gen \
-&&  go install k8s.io/code-generator/cmd/client-gen \
-&&  go install k8s.io/code-generator/cmd/lister-gen \
-&&  go install k8s.io/code-generator/cmd/informer-gen \
-&&  deepcopy-gen --alsologtostderr --input-dirs github.com/nokia/danm/crd/apis/danm/v1 -O zz_generated.deepcopy --bounding-dirs github.com/nokia/danm/crd/apis \
-&&  client-gen --alsologtostderr --clientset-name versioned --input-base "" --input github.com/nokia/danm/crd/apis/danm/v1 --clientset-path github.com/nokia/danm/crd/client/clientset \
-&&  lister-gen --alsologtostderr --input-dirs github.com/nokia/danm/crd/apis/danm/v1 --output-package github.com/nokia/danm/crd/client/listers \
-&&  informer-gen --alsologtostderr --input-dirs github.com/nokia/danm/crd/apis/danm/v1 --versioned-clientset-package github.com/nokia/danm/crd/client/clientset/versioned --listers-package github.com/nokia/danm/crd/client/listers --output-package github.com/nokia/danm/crd/client/informers \
-&&  go install -a -ldflags '-extldflags "-static"' github.com/nokia/danm/cmd/danm \
-&&  go install -a -ldflags '-extldflags "-static"' github.com/nokia/danm/cmd/fakeipam \
-&&  mkdir -p ${binaries}/danm \
-&&  cp $GOPATH/bin/{danm,fakeipam} ${binaries}/danm \
+&&  mkdir -p ${binaries} \
 #
 # Get Flannel
 #
-&&  mkdir -p ${binaries}/flannel \
 &&  go get -v github.com/containernetworking/plugins/plugins/meta/flannel \
-&&  cp ${GOPATH}/bin/flannel ${binaries}/flannel/flannel \
+&&  cp ${GOPATH}/bin/flannel ${binaries} \
 #
 # Build sriov-cni
 #
-&&  mkdir -p ${binaries}/sriov \
 &&  mkdir -p ${GOPATH}/src/github.com/intel/ \
 &&  cd ${GOPATH}/src/github.com/intel/ \
 &&  git clone https://github.com/intel/sriov-cni.git \
 &&  cd ${GOPATH}/src/github.com/intel/sriov-cni \
 &&  git checkout ${SRIOV_VERSION} \
 &&  make \
-&&  cp $GOPATH/src/github.com/intel/sriov-cni/build/sriov ${binaries}/sriov/sriov
+&&  cp $GOPATH/src/github.com/intel/sriov-cni/build/sriov ${binaries}