From 070d01e5bd833d393927b1dd863da92a630e9bfb Mon Sep 17 00:00:00 2001
From: Casey Kuhlman <casey@monax.io>
Date: Mon, 2 Jul 2018 23:36:27 +0100
Subject: [PATCH] move dockerfile
Signed-off-by: Casey Kuhlman <casey@monax.io>
---
.circleci/Dockerfile | 6 +++---
.circleci/config.yml | 3 +--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/.circleci/Dockerfile b/.circleci/Dockerfile
index 072232c1..62926585 100644
--- a/.circleci/Dockerfile
+++ b/.circleci/Dockerfile
@@ -1,10 +1,10 @@
-# docker build -t quay.io/monax/burrow:ci .
+# docker build -t quay.io/monax/build:burrow-ci .
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 .
+# docker build -t quay.io/monax/build:burrow-ci -f ./.circleci/Dockerfile .
RUN apk add --update --no-cache nodejs netcat-openbsd git openssh-client openssl 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 \
@@ -14,4 +14,4 @@ RUN curl -L -o /tmp/docker-$DOCKER_VERSION.tgz https://download.docker.com/linux
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
+RUN npm install -g mocha-circleci-reporter
diff --git a/.circleci/config.yml b/.circleci/config.yml
index e062f423..3f8b0408 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,7 +4,7 @@
defaults: &defaults
working_directory: /go/src/github.com/hyperledger/burrow
docker:
- - image: quay.io/monax/burrow:ci
+ - image: quay.io/monax/build:burrow-ci
tag_filters: &tags_filters
tags:
@@ -130,4 +130,3 @@ workflows:
<<: *tags_filters
branches:
only: develop
-
--
GitLab