Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed build in version in docker images. #441 #468

Merged
merged 2 commits into from
Oct 22, 2018
Merged

Fixed build in version in docker images. #441 #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de6fb39
Fixed build in version in docker images. #441
soffokl Oct 19, 2018
b0e5286
Merge branch 'master' into fix-version
Waldz Oct 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions bin/docker/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ FROM golang:1.11-alpine AS builder
RUN apk add --update --no-cache bash gcc musl-dev make \
&& rm -rf /var/cache/apk/*

ARG BUILD_BRANCH=$BUILD_BRANCH
ARG BUILD_COMMIT=$BUILD_COMMIT
ARG BUILD_NUMBER=$BUILD_NUMBER
ARG BUILD_VERSION=$BUILD_VERSION

# Compile application
WORKDIR /go/src/github.com/mysteriumnetwork/node
ADD . .
Expand Down
8 changes: 7 additions & 1 deletion bin/docker/ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
FROM mysteriumnetwork/mysterium-node-builder AS builder

ARG BUILD_BRANCH=$BUILD_BRANCH
ARG BUILD_COMMIT=$BUILD_COMMIT
ARG BUILD_NUMBER=$BUILD_NUMBER
ARG BUILD_VERSION=$BUILD_VERSION
ARG PACKAGE_VERSION

# Compile application
WORKDIR /go/src/github.com/mysteriumnetwork/node
ADD . .
ARG PACKAGE_VERSION

RUN GOOS=linux GOARCH=amd64 bin/build \
&& bin/package_debian ${PACKAGE_VERSION} amd64

Expand Down
4 changes: 4 additions & 0 deletions bin/package_docker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ source bin/helpers/output.sh

printf "Building Alpine image..\n"
docker build \
--build-arg BUILD_BRANCH=${BUILD_BRANCH} \
--build-arg BUILD_COMMIT=${BUILD_COMMIT} \
--build-arg BUILD_NUMBER=${BUILD_NUMBER} \
--build-arg BUILD_VERSION=${BUILD_VERSION} \
--file bin/docker/alpine/Dockerfile \
--tag myst:alpine \
.
Expand Down
4 changes: 4 additions & 0 deletions bin/package_docker_ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ fi

printf "Building Ubuntu image..\n"
docker build \
--build-arg BUILD_BRANCH=${BUILD_BRANCH} \
--build-arg BUILD_COMMIT=${BUILD_COMMIT} \
--build-arg BUILD_NUMBER=${BUILD_NUMBER} \
--build-arg BUILD_VERSION=${BUILD_VERSION} \
--file bin/docker/ubuntu/Dockerfile \
--build-arg PACKAGE_VERSION=${VERSION} \
--tag myst:ubuntu \
Expand Down