Circle CI 2.0 works · MEDIGO/laika@4015b48

Commit

Circle CI 2.0 works

Squashed commit of the following:

commit 0c14164
Author: Vinay Pinto <[email protected]>
Date:   Wed Apr 10 11:45:26 2019 +0200

    docker login needs no email

commit d3fc3ca
Author: Vinay Pinto <[email protected]>
Date:   Wed Apr 10 11:24:57 2019 +0200

    add some docker config

commit f80696c
Author: Vinay Pinto <[email protected]>
Date:   Wed Apr 10 10:59:50 2019 +0200

    Removed old circle 1.0

commit 82f1e4e
Author: Vinay Pinto <[email protected]>
Date:   Wed Apr 10 10:53:44 2019 +0200

    Gliding back

commit 70d8ef3
Merge: fdcaf2c 63e4829
Author: Utsav Tiwary <[email protected]>
Date:   Tue Apr 2 17:22:24 2019 +0200

    Merge pull request #147 from utsavtiwary04/circleci2

    publish and clean after make

commit 63e4829
Author: Utsav Tiwary <[email protected]>
Date:   Tue Apr 2 17:22:04 2019 +0200

    publish and clean after make

commit fdcaf2c
Merge: 79f78df 752d313
Author: Utsav Tiwary <[email protected]>
Date:   Tue Apr 2 17:17:11 2019 +0200

    Merge pull request #146 from utsavtiwary04/circleci2

    Circleci2

commit 752d313
Author: Utsav Tiwary <[email protected]>
Date:   Tue Apr 2 17:15:27 2019 +0200

    use npm instead of yarn

commit 500b057
Author: Utsav Tiwary <[email protected]>
Date:   Mon Apr 1 18:21:23 2019 +0200

    purge cmdtest

commit 79f78df
Merge: 9aa16bd ce49527
Author: Utsav Tiwary <[email protected]>
Date:   Mon Apr 1 18:12:18 2019 +0200

    Merge pull request #145 from utsavtiwary04/circleci2

    yarn instead of yarn install

commit ce49527
Author: Utsav Tiwary <[email protected]>
Date:   Mon Apr 1 18:11:50 2019 +0200

    yarn instead of yarn install

commit 9aa16bd
Merge: 8d20980 5e71e08
Author: Utsav Tiwary <[email protected]>
Date:   Mon Apr 1 18:09:36 2019 +0200

    Merge pull request #144 from utsavtiwary04/circleci2

    yarn instead of yarn install

commit 5e71e08
Author: Utsav Tiwary <[email protected]>
Date:   Mon Apr 1 18:09:12 2019 +0200

    yarn instead of yarn install

commit 8d20980
Merge: 949dc1d 24cdabe
Author: Utsav Tiwary <[email protected]>
Date:   Mon Apr 1 17:59:32 2019 +0200

    Merge pull request #143 from utsavtiwary04/circleci2

    remove cmdtest

commit 24cdabe
Author: Utsav Tiwary <[email protected]>
Date:   Mon Apr 1 17:58:55 2019 +0200

    remove cmdtest

commit 949dc1d
Merge: 4dfe313 6dbbb0c
Author: Utsav Tiwary <[email protected]>
Date:   Mon Apr 1 17:56:28 2019 +0200

    Merge pull request #142 from utsavtiwary04/circleci2

    install yarn just before triggering yarn install

commit 6dbbb0c
Author: Utsav Tiwary <[email protected]>
Date:   Mon Apr 1 17:55:50 2019 +0200

    install yarn just before triggering yarn install

commit 4dfe313
Merge: e81f371 7700b31
Author: Utsav Tiwary <[email protected]>
Date:   Mon Apr 1 17:52:31 2019 +0200

    Merge pull request #141 from utsavtiwary04/circleci2

    removed apt-update

commit 7700b31
Author: Utsav Tiwary <[email protected]>
Date:   Mon Apr 1 17:52:00 2019 +0200

    removed apt-update

commit e81f371
Merge: ff9a3e7 807f767
Author: Utsav Tiwary <[email protected]>
Date:   Mon Apr 1 17:40:00 2019 +0200

    Merge pull request #140 from utsavtiwary04/circleci2

    update apt before yarn install

commit 807f767
Author: Utsav Tiwary <[email protected]>
Date:   Mon Apr 1 17:39:36 2019 +0200

    update apt befoer yarn install

commit ff9a3e7
Merge: c3ba415 0e6ee3a
Author: Utsav Tiwary <[email protected]>
Date:   Mon Apr 1 17:36:11 2019 +0200

    Merge pull request #139 from utsavtiwary04/circleci2

    install yarn differently

commit 0e6ee3a
Author: Utsav Tiwary <[email protected]>
Date:   Mon Apr 1 17:35:16 2019 +0200

    install yarn differently

commit c3ba415
Merge: fd69dc6 78093be
Author: Utsav Tiwary <[email protected]>
Date:   Mon Apr 1 17:27:16 2019 +0200

    Merge pull request #138 from utsavtiwary04/circleci2

    list directories where install is run

commit 78093be
Author: Utsav Tiwary <[email protected]>
Date:   Mon Apr 1 17:26:33 2019 +0200

    list directories where install is run

commit fd69dc6
Merge: 6c708f8 03acfad
Author: Utsav Tiwary <[email protected]>
Date:   Mon Apr 1 17:20:40 2019 +0200

    Merge pull request #137 from utsavtiwary04/circleci2

    removed unwanted changes

commit 03acfad
Merge: e85fa95 6c708f8
Author: Utsav Tiwary <[email protected]>
Date:   Mon Apr 1 17:19:55 2019 +0200

    sync with circleci

commit e85fa95
Author: Utsav Tiwary <[email protected]>
Date:   Mon Apr 1 17:18:16 2019 +0200

    removed unwanted changes

commit 6c708f8
Merge: affe0f6 db207a9
Author: Utsav Tiwary <[email protected]>
Date:   Mon Apr 1 15:59:11 2019 +0200

    Merge pull request #136 from utsavtiwary04/circleci2

    Added ci-publish to push image to quay.io

commit db207a9
Author: Utsav Tiwary <[email protected]>
Date:   Mon Apr 1 15:58:13 2019 +0200

    Added -t tag for tagging images

commit a8aefe5
Author: Utsav Tiwary <[email protected]>
Date:   Mon Apr 1 15:54:11 2019 +0200

    Added new docker publish for quay

commit affe0f6
Merge: ce12993 e9e130d
Author: Utsav Tiwary <[email protected]>
Date:   Wed Mar 27 18:02:39 2019 +0100

    Merge pull request #135 from utsavtiwary04/circleci2

    Removed terminal output flag in docker command

commit e9e130d
Author: Utsav Tiwary <[email protected]>
Date:   Wed Mar 27 18:02:15 2019 +0100

    Removed terminal output flag in docker command

commit ce12993
Merge: c74ef21 5e0bdf1
Author: Utsav Tiwary <[email protected]>
Date:   Wed Mar 27 15:51:08 2019 +0100

    Merge pull request #134 from utsavtiwary04/circleci2

    Added yarn installation via apt-get to circleci config(sudo)

commit 5e0bdf1
Author: Utsav Tiwary <[email protected]>
Date:   Wed Mar 27 15:50:02 2019 +0100

    Added yarn installation via apt-get to circleci config(sudo)

commit c74ef21
Merge: 368f353 76c3f60
Author: Utsav Tiwary <[email protected]>
Date:   Wed Mar 27 15:48:51 2019 +0100

    Merge pull request #133 from utsavtiwary04/circleci2

    Added yarn installation via apt-get to circleci config

commit 76c3f60
Author: Utsav Tiwary <[email protected]>
Date:   Wed Mar 27 15:45:55 2019 +0100

    Added yarn installation via apt-get to circleci config

commit 368f353
Merge: 47c9de3 f1397d2
Author: Utsav Tiwary <[email protected]>
Date:   Wed Mar 27 15:33:20 2019 +0100

    Merge pull request #132 from utsavtiwary04/circleci2

    Added npm to circleci-docker image

commit f1397d2
Author: Utsav Tiwary <[email protected]>
Date:   Wed Mar 27 15:32:30 2019 +0100

    Added npm to circleci-docker image

commit 47c9de3
Merge: 1e8d2af 376af68
Author: Utsav Tiwary <[email protected]>
Date:   Wed Mar 27 15:18:50 2019 +0100

    Merge pull request #131 from utsavtiwary04/circleci2

    Added yarn installation to circle config

commit 376af68
Author: Utsav Tiwary <[email protected]>
Date:   Wed Mar 27 15:17:56 2019 +0100

    Added yarn installation to circle config

commit 1e8d2af
Merge: acdfa8a b4c25b0
Author: Utsav Tiwary <[email protected]>
Date:   Tue Mar 26 18:16:32 2019 +0100

    Merge pull request #130 from utsavtiwary04/circleci2

    Upgrade laika to circle ci 2

commit b4c25b0
Author: Utsav Tiwary <[email protected]>
Date:   Tue Mar 26 18:13:52 2019 +0100

    Formatting fix

commit 16d2843
Author: Utsav Tiwary <[email protected]>
Date:   Tue Mar 26 18:12:43 2019 +0100

    Upgrade laika to circle ci 2

Loading branch information

eggman64 committed Apr 10, 2019

1 parent b042ca3 commit 4015b48

.circleci/config.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,9 +3,18 @@ jobs: @@
         build:
             docker:
               - image: circleci/golang:1
+            working_directory: /go/src/github.com/MEDIGO/laika
             steps:
-                - setup_remote_docker
                 - checkout
+                - run: go get -u -v -t github.com/Masterminds/glide
+                - run: glide install -v
+                - run: touch .env
+                - run: pwd
+                - run: ls
+                - run: make install
+                - run: make build
+                - run: make report
+                - setup_remote_docker:
+                    docker_layer_caching: true
                 - run: make image
                 - run: make publish
-                - run: make clean

Makefile

-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    all: install lint test build report
+    all: install build report publish clean
     .PHONY: all
     build:
@@ Expand Down @@

circle.yml

This file was deleted.

scripts/build.sh

-Original file line number
+Diff line change
@@ Expand Up / @@ -5,4 +5,4 @@ set -o nounset @@
     set -o pipefail
     GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o bin/laika .
-    (cd dashboard && yarn run build)
+    (cd dashboard && npm run build)

scripts/ci-publish.sh

-Original file line number
+Diff line change
@@ -0,0 +1,16 @@
+    #!/bin/bash
+    set -o errexit
+    set -o nounset
+    set -o pipefail
+    if [[ -z ${CIRCLE_SHA1:-} ]]; then
+      COMMIT=$(git rev-parse HEAD)
+    else
+      COMMIT=${CIRCLE_SHA1}
+    fi
+    docker tag quay.io/medigo/laika:latest quay.io/medigo/laika:${COMMIT}
+    docker login -e ${DOCKER_EMAIL} -u ${DOCKER_USER} -p ${DOCKER_PASS}
+    docker push quay.io/medigo/laika:latest
+    docker push quay.io/medigo/laika:${COMMIT}

scripts/install.sh

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -9,4 +9,4 @@ if ! which glide > /dev/null 2>&1 ; then
  
    fi

    glide install

    (cd dashboard && yarn install)

    (cd dashboard && sudo apt install curl && curl -sL https://deb.nodesource.com/setup_6.x | sudo bash - && sudo apt-get install -y nodejs && sudo apt-get install -y npm && sudo npm install)

scripts/publish.sh

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -11,6 +11,6 @@ else
  
    fi

    docker tag medigo/laika:latest medigo/laika:${COMMIT}

    docker login -e ${DOCKER_EMAIL} -u ${DOCKER_USER} -p ${DOCKER_PASS}

    docker login -u ${DOCKER_USER} -p ${DOCKER_PASS}

    docker push medigo/laika:latest

    docker push medigo/laika:${COMMIT}

0 comments on commit `4015b48`

Please sign in to comment.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Commit

There are no files selected for viewing

0 comments on commit `4015b48`

Commit

There are no files selected for viewing

0 comments on commit 4015b48

0 comments on commit `4015b48`