From 598822bbf16958a2a3902fe28e63b11a80c87d51 Mon Sep 17 00:00:00 2001 From: msohailhussain Date: Thu, 19 Mar 2020 14:22:07 -0700 Subject: [PATCH 1/6] integration with fsc --- .travis.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.travis.yml b/.travis.yml index 57879563..e10b0c2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -93,6 +93,18 @@ jobs: script: - pytest -vv -rA --diff-type=split tests/acceptance/test_acceptance/ --host http://localhost:8080 + - stage: 'Building Optimizely Agent' + if: (branch = master AND type = push) OR type = pull_request OR tag IS present + env: + SDK=agent + SDK_BRANCH=$(if [ -z "$TRAVIS_PULL_REQUEST_BRANCH" ]; then echo ${TRAVIS_BRANCH}; else echo "$TRAVIS_PULL_REQUEST_BRANCH"; fi) + cache: false + before_install: + ./pull_travis_ci_tools.sh + install: skip + script: + - "$HOME/travisci-tools/trigger-script-with-status-update.sh" + - stage: Build if: type = push AND tag IS present name: linux From 6ade5ee3321ce32f43cda23005918c7786a33077 Mon Sep 17 00:00:00 2001 From: Sohail Hussain Date: Thu, 19 Mar 2020 14:41:07 -0700 Subject: [PATCH 2/6] added missing files --- .travis.yml | 2 +- scripts/pull_travis_ci_tools.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100755 scripts/pull_travis_ci_tools.sh diff --git a/.travis.yml b/.travis.yml index e10b0c2a..91bf66f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,7 +100,7 @@ jobs: SDK_BRANCH=$(if [ -z "$TRAVIS_PULL_REQUEST_BRANCH" ]; then echo ${TRAVIS_BRANCH}; else echo "$TRAVIS_PULL_REQUEST_BRANCH"; fi) cache: false before_install: - ./pull_travis_ci_tools.sh + ./scripts/pull_travis_ci_tools.sh install: skip script: - "$HOME/travisci-tools/trigger-script-with-status-update.sh" diff --git a/scripts/pull_travis_ci_tools.sh b/scripts/pull_travis_ci_tools.sh new file mode 100755 index 00000000..a69afb31 --- /dev/null +++ b/scripts/pull_travis_ci_tools.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -e +BRANCH_NAME=${1:-master} +mkdir $HOME/travisci-tools && pushd $HOME/travisci-tools && git init && git pull https://$CI_USER_TOKEN@github.com/optimizely/travisci-tools.git $BRANCH_NAME && popd + From 6355dc6a8026551f89ebb828a5551aa3c8e0689b Mon Sep 17 00:00:00 2001 From: Sohail Hussain Date: Sun, 22 Mar 2020 20:06:03 -0700 Subject: [PATCH 3/6] fix statik issue --- Dockerfile.static | 11 +++++++++++ scripts/Makefile.ci | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 Dockerfile.static diff --git a/Dockerfile.static b/Dockerfile.static new file mode 100644 index 00000000..991e2b55 --- /dev/null +++ b/Dockerfile.static @@ -0,0 +1,11 @@ +ARG GO_VERSION +FROM golang:latest as builder + +WORKDIR /go/src/github.com/optimizely/agent +COPY . . +RUN make ci_build_static_binary + +FROM ubuntu:latest +COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ +COPY --from=builder /go/src/github.com/optimizely/agent/bin/optimizely /optimizely +CMD ["/optimizely"] diff --git a/scripts/Makefile.ci b/scripts/Makefile.ci index 343195a6..d45d9dea 100644 --- a/scripts/Makefile.ci +++ b/scripts/Makefile.ci @@ -1,6 +1,6 @@ .DEFAULT_GOAL := help -ci_build_static_binary: ## build static binary +ci_build_static_binary: check-go ## build static binary CGO_ENABLED=0 $(GOBUILD) $(LDFLAGS) -o $(GOBIN)/$(TARGET) cmd/optimizely/main.go ci_build_dockerimage: ## build minimal docker image of optimizely From aaba3426fed38ae2df8e2d5a6385b43315e7e0be Mon Sep 17 00:00:00 2001 From: Sohail Hussain Date: Sun, 22 Mar 2020 23:13:10 -0700 Subject: [PATCH 4/6] statik fix --- scripts/dockerfiles/Dockerfile.static | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/dockerfiles/Dockerfile.static b/scripts/dockerfiles/Dockerfile.static index a9bf96b9..0a88e973 100644 --- a/scripts/dockerfiles/Dockerfile.static +++ b/scripts/dockerfiles/Dockerfile.static @@ -3,6 +3,7 @@ FROM golang:$GO_VERSION as builder WORKDIR /go/src/github.com/optimizely/agent COPY . . +RUN go get github.com/rakyll/statik RUN make ci_build_static_binary FROM scratch From 5d6b28470645fe923b5d592efef73277cdfe8e69 Mon Sep 17 00:00:00 2001 From: Sohail Hussain Date: Mon, 23 Mar 2020 14:23:56 -0700 Subject: [PATCH 5/6] rebasing --- Dockerfile.static | 11 ----------- scripts/dockerfiles/Dockerfile.static | 1 - 2 files changed, 12 deletions(-) delete mode 100644 Dockerfile.static diff --git a/Dockerfile.static b/Dockerfile.static deleted file mode 100644 index 991e2b55..00000000 --- a/Dockerfile.static +++ /dev/null @@ -1,11 +0,0 @@ -ARG GO_VERSION -FROM golang:latest as builder - -WORKDIR /go/src/github.com/optimizely/agent -COPY . . -RUN make ci_build_static_binary - -FROM ubuntu:latest -COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ -COPY --from=builder /go/src/github.com/optimizely/agent/bin/optimizely /optimizely -CMD ["/optimizely"] diff --git a/scripts/dockerfiles/Dockerfile.static b/scripts/dockerfiles/Dockerfile.static index df75cf8e..a881ea43 100644 --- a/scripts/dockerfiles/Dockerfile.static +++ b/scripts/dockerfiles/Dockerfile.static @@ -3,7 +3,6 @@ FROM golang:$GO_VERSION as builder WORKDIR /go/src/github.com/optimizely/agent COPY . . - RUN make install RUN make ci_build_static_binary From 9ddfb27e7cf9c6c80cf09bc9840efedf9a2f839b Mon Sep 17 00:00:00 2001 From: Yasir Ali Date: Tue, 24 Mar 2020 14:01:52 +0500 Subject: [PATCH 6/6] Using static in dockerfile. --- scripts/dockerfiles/Dockerfile.static | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/dockerfiles/Dockerfile.static b/scripts/dockerfiles/Dockerfile.static index a881ea43..34b82662 100644 --- a/scripts/dockerfiles/Dockerfile.static +++ b/scripts/dockerfiles/Dockerfile.static @@ -4,6 +4,7 @@ FROM golang:$GO_VERSION as builder WORKDIR /go/src/github.com/optimizely/agent COPY . . RUN make install +RUN make static RUN make ci_build_static_binary FROM scratch