Skip to content

Commit 81dc022

Browse files
authored
Merge pull request #4 from dmatch01/add-build-script
Added build script for new git repo.
2 parents 92e630a + 9a38df6 commit 81dc022

File tree

8 files changed

+23
-59
lines changed

8 files changed

+23
-59
lines changed

Makefile

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
BIN_DIR=_output/bin
22
RELEASE_VER=v0.2
3-
CONTRIB_VENDOR_GOPATH=${HOME}/tmp/contrib/DLaaS
43
CURRENT_DIR=$(shell pwd)
5-
CONTRIB_VENDOR_GOPATH_SRC_TARGET=${CURRENT_DIR}/vendor
6-
SYM_LINK_EXISTS=$(shell [ -e ${CONTRIB_VENDOR_GOPATH}/src ] && echo 1 || echo 0 )
7-
ORIG_GOPATH=${GOPATH}
84

95
kar-controller: init
106
CGO_ENABLED=0 GOARCH=amd64 go build -o ${BIN_DIR}/kar-controllers ./cmd/kar-controllers/
@@ -17,9 +13,11 @@ verify: generate-code
1713
init:
1814
mkdir -p ${BIN_DIR}
1915

20-
generate-code: set_gopath_to_generate_code
21-
GOPATH=${ORIG_GOPATH} go build -o ${BIN_DIR}/deepcopy-gen ./cmd/deepcopy-gen/
22-
GOPATH=${CONTRIB_VENDOR_GOPATH}:${GOPATH} ${BIN_DIR}/deepcopy-gen -i ./pkg/apis/controller/v1alpha1/ -O zz_generated.deepcopy -o ../../../../..
16+
generate-code:
17+
$(info Compiling deepcopy-gen)
18+
go build -o ${BIN_DIR}/deepcopy-gen ./cmd/deepcopy-gen/
19+
$(info Generating deepcopy)
20+
${BIN_DIR}/deepcopy-gen -i ./pkg/apis/controller/v1alpha1/ -O zz_generated.deepcopy
2321

2422
images: kube-batch
2523
cp ./_output/bin/kube-batch ./deployment/images/
@@ -39,14 +37,3 @@ coverage:
3937
clean:
4038
rm -rf _output/
4139
rm -f kar-controllers
42-
43-
set_gopath_to_generate_code: set_gopath_to_generate_code_clean
44-
$(info Make a temporary path to hold the creation of a symbolic link for contrib vendor directory)
45-
mkdir -p ${CONTRIB_VENDOR_GOPATH}
46-
$(info Set symbolic link inside the path of the CONTRIB_VENDOR_GOPATH variable to link to vender directory in contrib)
47-
cd ${CONTRIB_VENDOR_GOPATH} && ln -s ${CONTRIB_VENDOR_GOPATH_SRC_TARGET} src
48-
49-
50-
set_gopath_to_generate_code_clean:
51-
$(info Removing symbolic link to vender directory in contrib)
52-
$(shell if [ "${SYM_LINK_EXISTS}" = "1" ]; then cd ${CONTRIB_VENDOR_GOPATH}; rm src; fi;)

deployment/Dockerfile.build

Lines changed: 0 additions & 6 deletions
This file was deleted.

deployment/Dockerfile.dispatcher

Lines changed: 0 additions & 12 deletions
This file was deleted.

deployment/Dockerfile.dispatcher.all.agents

Lines changed: 0 additions & 12 deletions
This file was deleted.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/sh
2+
3+
set -x
4+
5+
apk add make
6+
apk add git
7+
8+
cd .. && make generate-code && make kar-controller

deployment/build.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/bash
2+
set -x
3+
4+
project_root=$(cd ..; pwd)
5+
git_path=github.com/kubernetes-sigs/kube-batch
6+
7+
container_id=$(docker run --rm -v "$project_root":/go/src/$git_path -d -w /go/src/$git_path/deployment golang:alpine ./build-inside-container.sh)
8+
#container_id=$(docker run --rm -v "$project_root":/go/src/$git_path -d -w /go/src/$git_path/deployment golang:alpine sleep 999999999)
9+
10+
docker logs -f $container_id

deployment/build_compile_image_1.sh

Lines changed: 0 additions & 3 deletions
This file was deleted.

deployment/compile_kar_2.sh

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)