From 906265041ac088ad121b9eabf78efa683dac1e1a Mon Sep 17 00:00:00 2001
From: Silas Davis <silas@erisindustries.com>
Date: Tue, 5 Sep 2017 11:38:23 +0100
Subject: [PATCH] Use arg in dockerfile and remove volume
---
.circleci/config.yml | 11 +++++------
CHANGELOG.md | 3 +++
Dockerfile | 6 +-----
3 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5ac863b8..404baac9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -59,10 +59,10 @@ workflows:
test_and_release:
jobs:
- checkout_code:
- # Rather annoyingly we need this boilerplate on all transitive
+ # Rather annoyingly we need to include tags_filters on all transitive
# dependencies if we want the deploy job to build against a version
# tag.
- # Also note jobs build against all branches by default
+ # In contract jobs build against all branches by default
filters:
<<: *tags_filters
- test:
@@ -82,11 +82,10 @@ workflows:
- test
- test_integration
filters:
+ # tags filters and branch filters are applied disjunctively, so we
+ # will still build tags not on develop (i.e. including tagged
+ # releases on master that we specifically want to build)
<<: *tags_filters
branches:
- # Although we seem to exclude the master branch below, since
- # matching on tags is independent we will still build tags that
- # happen to point to a commit on master
- # We push dev pre-release images for every commit on develop
only: develop
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a78b5fe..59ce4188 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
# burrow changelog
+## v0.17.1
+Minor tweaks to docker build file
+
## v0.17.0
This is a service release with some significant ethereum/solidity compatibility improvements and new logging features. It includes:
diff --git a/Dockerfile b/Dockerfile
index 033acdbb..f4850d48 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ MAINTAINER Monax <support@monax.io>
RUN apk add --no-cache --update git
RUN go get github.com/Masterminds/glide
-ENV REPO $GOPATH/src/github.com/hyperledger/burrow
+ARG REPO=$GOPATH/src/github.com/hyperledger/burrow
COPY . $REPO
WORKDIR $REPO
RUN glide install
@@ -17,13 +17,9 @@ RUN go build --ldflags '-extldflags "-static"' -o bin/burrow-client ./client/cmd
# This will be our base container image
FROM alpine:3.6
-# There does not appear to be a way to share environment variables between stages
-ENV REPO /go/src/github.com/hyperledger/burrow
-
ENV USER monax
ENV MONAX_PATH /home/$USER/.monax
RUN addgroup -g 101 -S $USER && adduser -S -D -u 1000 $USER $USER
-VOLUME $MONAX_PATH
WORKDIR $MONAX_PATH
USER $USER:$USER
--
GitLab