From 3ff4f3324e60d4ecfb0e538bd94b5568a7c23649 Mon Sep 17 00:00:00 2001
From: Silas Davis <silas@monax.io>
Date: Fri, 13 Apr 2018 09:37:00 -0400
Subject: [PATCH] Add dockerfile for circle ci with npm
Signed-off-by: Silas Davis <silas@monax.io>
---
.circleci/Dockerfile | 16 ++++++++++++++++
.circleci/config.yml | 7 +++----
2 files changed, 19 insertions(+), 4 deletions(-)
create mode 100644 .circleci/Dockerfile
diff --git a/.circleci/Dockerfile b/.circleci/Dockerfile
new file mode 100644
index 00000000..c706055d
--- /dev/null
+++ b/.circleci/Dockerfile
@@ -0,0 +1,16 @@
+FROM golang:1.10.1-alpine3.7
+MAINTAINER Monax <support@monax.io>
+
+ENV DOCKER_VERSION "17.12.1-ce"
+# This is the image used by the Circle CI config in this directory pushed to quay.io/monax/bosmarmot:ci
+# docker build -t quay.io/monax/burrow:ci -f ./.circleci/Dockerfile .
+RUN apk add --update --no-cache nodejs netcat-openbsd git openssh-client make bash gcc g++ jq curl
+# get docker client
+RUN curl -L -o /tmp/docker-$DOCKER_VERSION.tgz https://download.docker.com/linux/static/stable/x86_64/docker-$DOCKER_VERSION.tgz \
+ && tar -xz -C /tmp -f /tmp/docker-$DOCKER_VERSION.tgz \
+ && mv /tmp/docker/docker /usr/bin \
+ && rm -rf /tmp/docker-$DOCKER_VERSION /tmp/docker
+RUN go get github.com/jstemmer/go-junit-report
+RUN go get -u github.com/golang/dep/cmd/dep
+RUN npm install -g mocha
+RUN npm install -g mocha-circleci-reporter
\ No newline at end of file
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3de942fc..c8d510a9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,14 +4,14 @@
defaults: &defaults
working_directory: /go/src/github.com/hyperledger/burrow
docker:
- - image: circleci/golang:1.10.1
+ - image: quay.io/monax/burrow:ci
tag_filters: &tags_filters
tags:
only: /^v[0-9]+\.[0-9]+\.[0-9]+$/
setup_docker: &setup_docker
- version: 17.06.1-ce
+ version: 17.11.0-ce
# Start of CircleCI 2.0 config
version: 2
@@ -28,7 +28,6 @@ jobs:
<<: *defaults
steps:
- checkout
- - run: sudo apt-get install libgmp3-dev
- run: make test_integration
test_integration_bosmarmot:
@@ -51,7 +50,7 @@ jobs:
- setup_remote_docker:
<<: *setup_docker
# build docker image and tag the docker image(s) depending on branch/tag
- - run: make build_docker_db
+ - run: make docker_build
- run: docker save quay.io/monax/db > db-images.tar
- persist_to_workspace:
root: .
--
GitLab