MYST-413 Fix broken Alpine image

.dockerignore

@@ -1,5 +1,2 @@
-build/server/ca.*
-build/server/server.*
-build/server/tc.key
-build/server/*.sock
-build/client/*.sock
+build/
+.git/

bin/client_build

@@ -13,7 +13,8 @@
 #> GOOS=windows GOARCH=amd64 bin/client_build
 #
 # Check if program has dynamic libraries:
-#> readelf -d /build/client/mysterium_client
+#> brew install readelf
+#> readelf -d build/client/mysterium_client
 
 source bin/helpers/functions.sh
 source bin/helpers/load_environment.sh
@@ -29,4 +30,4 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-exit 0
+exit 0

bin/client_docker/alpine/Dockerfile

@@ -0,0 +1,26 @@
+FROM golang:1.9.2-alpine AS builder
+
+# Install packages
+RUN apk add --update --no-cache bash g++ make \
+    && rm -rf /var/cache/apk/*
+
+# Compile application
+WORKDIR /go/src/github.com/mysterium/node
+ADD . .
+RUN bin/client_build
+
+
+
+FROM alpine:3.6
+MAINTAINER Valdas Petrulis <petrulis.valdas@gmail.com>
+
+# Install packages
+RUN apk add --update --no-cache bash iptables ca-certificates openvpn \
+    && rm -rf /var/cache/apk/*
+
+# Install application
+COPY bin/client_docker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
+
+COPY bin/client_package/config /etc/mysterium-node
+COPY --from=builder /go/src/github.com/mysterium/node/build/client/mysterium_client /usr/bin/mysterium_client

bin/client_package_docker

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+###########################################################################
+# Creates Docker image and uploads it to DockerHub https://hub.docker.com/r/mysteriumnetwork/mysterium-node/
+#
+# To create a release, simply execute:
+#> bin/client_package_docker version [tag..]
+
+# Usage example:
+#> bin/client_package_docker 0.0.1
+#> bin/client_package_docker 0.0.1 0.0.1-alpine alpine latest
+
+VERSION=$1
+if [ -z "$VERSION" ]; then
+    printf "\e[0;31m%s\e[0m\n" "Missing version!"
+    exit 1
+fi
+
+DOCKER_IMAGE="mysteriumnetwork/mysterium-client"
+
+printf "Building Alpine image..\n" \
+    && docker build \
+        --file bin/client_docker/alpine/Dockerfile \
+        --build-arg PACKAGE_VERSION=$VERSION \
+        --tag $DOCKER_IMAGE:$VERSION-alpine \
+        .
+if [ $? -ne 0 ] ; then
+    printf "\e[0;31m%s\e[0m\n" "Failed to build Alpine image!"
+    exit 1
+fi
+
+shift
+while test $# -gt 0; do
+    DOCKER_TAG=$1
+    printf "Publishing version '$DOCKER_TAG' image..\n" \
+        && docker tag $DOCKER_IMAGE:$VERSION-alpine $DOCKER_IMAGE:$DOCKER_TAG \
+        && docker push $DOCKER_IMAGE:$DOCKER_TAG
+    shift
+done
+
+printf "\e[0;32m%s\e[0m\n" "Docker image building process complete!"
+exit 0

bin/client_package_docker_ubuntu

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+###########################################################################
+# Creates Docker image and uploads it to DockerHub https://hub.docker.com/r/mysteriumnetwork/mysterium-node/
+#
+# To create a release, simply execute:
+#> bin/client_package_docker version [tag..]
+
+# Usage example:
+#> bin/client_package_docker_ubuntu 0.0.1
+#> bin/client_package_docker_ubuntu 0.0.1 0.0.1-ubuntu ubuntu
+
+VERSION=$1
+if [ -z "$VERSION" ]; then
+    printf "\e[0;31m%s\e[0m\n" "Missing version!"
+    exit 1
+fi
+
+DOCKER_IMAGE="mysteriumnetwork/mysterium-client"
+
+printf "Building Ubuntu image..\n" \
+    && docker build \
+        --file bin/client_docker/ubuntu/Dockerfile \
+        --build-arg PACKAGE_VERSION=$VERSION \
+        --tag $DOCKER_IMAGE:$VERSION-ubuntu \
+        .
+if [ $? -ne 0 ] ; then
+    printf "\e[0;31m%s\e[0m\n" "Failed to build Ubuntu image!"
+    exit 1
+fi
+
+shift
+while test $# -gt 0; do
+    DOCKER_TAG=$1
+    printf "Publishing version '$DOCKER_TAG' image..\n" \
+        && docker tag $DOCKER_IMAGE:$VERSION-ubuntu $DOCKER_IMAGE:$DOCKER_TAG \
+        && docker push $DOCKER_IMAGE:$DOCKER_TAG
+    shift
+done
+
+printf "\e[0;32m%s\e[0m\n" "Docker image building process complete!"
+exit 0

bin/package_all

@@ -49,6 +49,10 @@ printf "Creating build directory '$DIR_BUILD' ..\n" \
     && GOOS=darwin GOARCH=amd64 bin/client_build \
     && mv build/client/mysterium_client $DIR_BUILD/mysterium_client_osx_amd64 \
 && printf "\n\n" \
-    && GOOS=darwin GOARCH=386 bin/client_build \
-    && mv build/client/mysterium_client $DIR_BUILD/mysterium_client_osx_386 \
+    && bin/server_package_docker $VERSION $VERSION-alpine alpine latest \
+    && bin/server_package_docker_ubuntu $VERSION $VERSION-ubuntu ubuntu \
+    && bin/client_package_docker $VERSION $VERSION-alpine alpine latest \
+    && bin/client_package_docker_ubuntu $VERSION $VERSION-ubuntu ubuntu \
+&& printf "\n\n" \
+
 && printf "\e[0;32m%s\e[0m\n" "All packages successfully packaged to directory '$DIR_BUILD'!"

bin/server_build

@@ -13,7 +13,8 @@
 #> GOOS=windows GOARCH=amd64 bin/server_build
 #
 # Check if program has dynamic libraries:
-#> readelf -d /build/server/mysterium_server
+#> brew install readelf
+#> readelf -d build/server/mysterium_server
 
 source bin/helpers/functions.sh
 source bin/helpers/load_environment.sh
@@ -29,4 +30,4 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-exit 0
+exit 0

bin/server_docker/alpine/Dockerfile

@@ -1,27 +1,26 @@
 FROM golang:1.9.2-alpine AS builder
 
 # Install packages
-RUN apk add --update bash \
+RUN apk add --update --no-cache bash g++ make \
     && rm -rf /var/cache/apk/*
 
 # Compile application
 WORKDIR /go/src/github.com/mysterium/node
 ADD . .
-RUN GOOS=linux GOARCH=amd64 bin/server_build
+RUN bin/server_build
 
 
 
 FROM alpine:3.6
 MAINTAINER Valdas Petrulis <petrulis.valdas@gmail.com>
 
 # Install packages
-RUN apk update \
-    && apk add --no-cache iptables ca-certificates openvpn \
+RUN apk add --update --no-cache bash iptables ca-certificates openvpn \
     && rm -rf /var/cache/apk/*
 
 # Install application
-COPY --from=builder /go/src/github.com/mysterium/node/build/server/mysterium_server /usr/bin/mysterium_server
-COPY bin/server_package/config /etc/mysterium-node
-
 COPY bin/server_docker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
-ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
+ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
+
+COPY bin/server_package/config /etc/mysterium-node
+COPY --from=builder /go/src/github.com/mysterium/node/build/server/mysterium_server /usr/bin/mysterium_server

bin/server_docker/docker-entrypoint-debug.sh

@@ -4,4 +4,4 @@ set -e
 while true;
     echo "Sleeping..";
     do sleep 5;
-done
+done

bin/server_package_docker

@@ -4,11 +4,11 @@
 # Creates Docker image and uploads it to DockerHub https://hub.docker.com/r/mysteriumnetwork/mysterium-node/
 #
 # To create a release, simply execute:
-#> bin/server_package_docker version [docker_tag]
+#> bin/server_package_docker version [tag..]
 
 # Usage example:
 #> bin/server_package_docker 0.0.1
-#> bin/server_package_docker 0.0.1 latest
+#> bin/server_package_docker 0.0.1 0.0.1-alpine alpine latest
 
 VERSION=$1
 if [ -z "$VERSION" ]; then
@@ -17,22 +17,26 @@ if [ -z "$VERSION" ]; then
 fi
 
 DOCKER_IMAGE="mysteriumnetwork/mysterium-node"
-DOCKER_TAG=$2
-if [ -z "$DOCKER_TAG" ]; then
-    DOCKER_TAG=$VERSION
-fi
 
-printf "Building Docker image '$DOCKER_IMAGE:$DOCKER_TAG' ..\n" \
+printf "Building Alpine image..\n" \
     && docker build \
-        --file bin/server_docker/ubuntu/Dockerfile \
+        --file bin/server_docker/alpine/Dockerfile \
         --build-arg PACKAGE_VERSION=$VERSION \
-        --tag $DOCKER_IMAGE:$DOCKER_TAG \
-        . \
-    && docker push $DOCKER_IMAGE:$DOCKER_TAG
+        --tag $DOCKER_IMAGE:$VERSION-alpine \
+        .
 if [ $? -ne 0 ] ; then
-    printf "\e[0;31m%s\e[0m\n" "Failed to build Docker image!"
+    printf "\e[0;31m%s\e[0m\n" "Failed to build Alpine image!"
     exit 1
 fi
 
+shift
+while test $# -gt 0; do
+    DOCKER_TAG=$1
+    printf "Publishing version '$DOCKER_TAG' image..\n" \
+        && docker tag $DOCKER_IMAGE:$VERSION-alpine $DOCKER_IMAGE:$DOCKER_TAG \
+        && docker push $DOCKER_IMAGE:$DOCKER_TAG
+    shift
+done
+
 printf "\e[0;32m%s\e[0m\n" "Docker image building process complete!"
 exit 0

bin/server_package_docker_ubuntu

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+###########################################################################
+# Creates Docker image and uploads it to DockerHub https://hub.docker.com/r/mysteriumnetwork/mysterium-node/
+#
+# To create a release, simply execute:
+#> bin/server_package_docker version [tag..]
+
+# Usage example:
+#> bin/server_package_docker_ubuntu 0.0.1
+#> bin/server_package_docker_ubuntu 0.0.1 0.0.1-ubuntu ubuntu
+
+VERSION=$1
+if [ -z "$VERSION" ]; then
+    printf "\e[0;31m%s\e[0m\n" "Missing version!"
+    exit 1
+fi
+
+DOCKER_IMAGE="mysteriumnetwork/mysterium-node"
+
+printf "Building Ubuntu image..\n" \
+    && docker build \
+        --file bin/server_docker/ubuntu/Dockerfile \
+        --build-arg PACKAGE_VERSION=$VERSION \
+        --tag $DOCKER_IMAGE:$VERSION-ubuntu \
+        .
+if [ $? -ne 0 ] ; then
+    printf "\e[0;31m%s\e[0m\n" "Failed to build Ubuntu image!"
+    exit 1
+fi
+
+shift
+while test $# -gt 0; do
+    DOCKER_TAG=$1
+    printf "Publishing version '$DOCKER_TAG' image..\n" \
+        && docker tag $DOCKER_IMAGE:$VERSION-ubuntu $DOCKER_IMAGE:$DOCKER_TAG \
+        && docker push $DOCKER_IMAGE:$DOCKER_TAG
+    shift
+done
+
+printf "\e[0;32m%s\e[0m\n" "Docker image building process complete!"
+exit 0

bin/travis_scripts/ensure_glide.sh

@@ -5,7 +5,7 @@ GLIDE_VERSION=$2
 
 
 OS_ARCH="linux-amd64"
-if [ "$TRAVIS_OS_NAME"=="osx" ]; then
+if [ "$TRAVIS_OS_NAME" == "osx" ]; then
     OS_ARCH="darwin-amd64"
 fi
 

docker-compose.yml

@@ -4,12 +4,27 @@ services:
   broker:
     tty: true
     image: nats
-    networks:
-      - default
     ports:
       - 4222:4222
       - 8222:8222
 
+  server-alpine:
+    privileged: true
+    tty: true
+    build:
+      context: .
+      dockerfile: bin/server_docker/alpine/Dockerfile
+    depends_on:
+      - broker
+    cap_add:
+      - MKNOD
+      - NET_ADMIN
+    ports:
+      - 11941:1194
+    environment:
+      MYSTERIUM_SERVER_IDENTITY: ""
+      MYSTERIUM_SERVER_IDENTITY_PASSPHRASE: ""
+
   server-ubuntu:
     privileged: true
     tty: true
@@ -23,31 +38,32 @@ services:
     cap_add:
       - MKNOD
       - NET_ADMIN
-    networks:
-      - default
     ports:
-      - 1194:1194
+      - 11942:1194
     environment:
       MYSTERIUM_SERVER_IDENTITY: ""
       MYSTERIUM_SERVER_IDENTITY_PASSPHRASE: ""
-      MYSTERIUM_DISCOVERY_ADDRESS: ""
-      MYSTERIUM_BROKER_ADDRESS: ""
 
-  client:
+  client-alpine:
+    privileged: true
+    tty: true
+    build:
+      context: .
+      dockerfile: bin/client_docker/alpine/Dockerfile
+    ports:
+      - 40501:4050
+    environment:
+      MYSTERIUM_CLIENT_TEQUILAPI_PORT: 4050
+
+  client-ubuntu:
     privileged: true
     tty: true
     build:
       context: .
       dockerfile: bin/client_docker/ubuntu/Dockerfile
       args:
         PACKAGE_VERSION: 0.0.1-docker
-    depends_on:
-      - broker
-      - server-ubuntu
-    networks:
-      - default
     ports:
-      - 4050:4050
+      - 40502:4050
     environment:
       MYSTERIUM_CLIENT_TEQUILAPI_PORT: 4050
-      MYSTERIUM_DISCOVERY_ADDRESS: ""