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.

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

docker builder script; package_all remade to acomodate new builder #198

Merged
merged 4 commits into from Mar 13, 2018

Conversation

Projects
None yet
3 participants
@zolia
Copy link
Member

commented Mar 12, 2018

No description provided.

@zolia zolia requested review from tadovas and Waldz Mar 12, 2018

@@ -0,0 +1,17 @@
FROM golang:1.9.2 AS builder

ARG PACKAGE_VERSION

This comment has been minimized.

Copy link
@Waldz

Waldz Mar 12, 2018

Member

Not needed

&& mv build/client/mysterium_client $DIR_BUILD/mysterium_client_linux_386 \
&& printf "\n\n" \
&& GOOS=linux GOARCH=arm bin/client_build \
&& bin/client_package_debian $VERSION armhf \
&& bin/package_builder "bin/client_build; bin/client_package_debian" $VERSION armhf \

This comment has been minimized.

Copy link
@tadovas

tadovas Mar 12, 2018

Member

What about moving these a lot of building lines for different architectures into single loop? for example:
for each arch in architectures: package server, package client

exit 1
fi

VERSION=$2

This comment has been minimized.

Copy link
@Waldz

Waldz Mar 12, 2018

Member

I would name this script builder_run and decouple from VERSION & ARCH variables
builder_run - runs any give command inside Docker container e.g. bin/builder_run bin/server_package_debian 0.0.6 amd64

This comment has been minimized.

Copy link
@Waldz

Waldz Mar 12, 2018

Member

CONTRIBUTING.md -> Debian packaging could be updated now

#> bin/server_builder_docker 0.0.1
#> bin/server_builder_docker 0.0.1 latest

VERSION=$1

This comment has been minimized.

Copy link
@Waldz

Waldz Mar 12, 2018

Member

Do we need versions for builder tool? latest is enough

--build-arg PACKAGE_VERSION=$VERSION \
--tag $DOCKER_IMAGE:$DOCKER_TAG \
. \
&& docker push $DOCKER_IMAGE:$DOCKER_TAG

This comment has been minimized.

Copy link
@Waldz

Waldz Mar 12, 2018

Member

Could be align this script in server_package_docker

  • builder_package - builds just local image
  • builder_package latest - builds && pushes to Docker hub
@@ -0,0 +1,17 @@
FROM golang:1.9.2 AS builder

This comment has been minimized.

Copy link
@Waldz

Waldz Mar 12, 2018

Member

Would be nice to use this new image in bin/server_docker/ubuntu/Dockerfile etc.

This comment has been minimized.

Copy link
@zolia

zolia Mar 12, 2018

Author Member

changed; tested

printf "Building Docker image '$DOCKER_IMAGE' ..\n" \
&& docker build \
--file bin/util_docker/builder/Dockerfile \
--build-arg PACKAGE_VERSION=latest \

This comment has been minimized.

Copy link
@Waldz

Waldz Mar 12, 2018

Member

Not needed argument

@@ -1,4 +1,4 @@
FROM golang:1.9.2 AS builder
FROM mysteriumnetwork/mysterium-node-builder AS builder

This comment has been minimized.

Copy link
@Waldz
@Waldz

Waldz approved these changes Mar 13, 2018

@Waldz Waldz merged commit b247058 into master Mar 13, 2018

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@Waldz Waldz deleted the HOTFIX/docker-builder-to-build-linux-archs branch Mar 13, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.