Merge pull request #154 from rohitsakala/rohit/s390x

Add s390x arch support

Author: luthermonson

.drone.yml

@@ -136,6 +136,78 @@ volumes:
 
 ---
 
+kind: pipeline
+name: s390x
+
+platform:
+  os: linux
+  arch: amd64
+
+node:
+  arch: s390x
+
+steps:
+  - name: build
+    pull: default
+    image: rancher/dapper:v0.5.8
+    commands:
+      - dapper ci
+    privileged: true
+    volumes:
+      - name: docker
+        path: /var/run/docker.sock
+    when:
+      event:
+        - tag
+        - pull_request
+
+  - name: github_binary_release
+    image: rancher/drone-images:github-release-s390x
+    settings:
+      api_key:
+        from_secret: github_token
+      files:
+      - "dist/artifacts/*"
+    when:
+      instance:
+      - drone-publish.rancher.io
+      ref:
+      - refs/head/master
+      - refs/tags/*
+      event:
+      - tag
+
+  - name: stage-binaries
+    image: rancher/dapper:v0.5.8
+    commands:
+      - "cp -r ./bin/* ./package/"
+    when:
+      event:
+        - tag
+
+  - name: docker-publish
+    image: rancher/drone-images:docker-s390x
+    settings:
+      purge: false
+      context: package/
+      dockerfile: package/Dockerfile
+      password:
+        from_secret: docker_password
+      repo: rancher/machine
+      tag: "${DRONE_TAG}-s390x"
+      username:
+        from_secret: docker_username
+    when:
+      event:
+        - tag
+
+volumes:
+  - name: docker
+    host:
+      path: /var/run/docker.sock
+
+---
+
 kind: pipeline
 name: manifest
 
@@ -150,6 +222,7 @@ steps:
       platforms:
         - linux/amd64
         - linux/arm64
+        - linux/s390x
       target: "rancher/machine:${DRONE_TAG}"
       template: "rancher/machine:${DRONE_TAG}-ARCH"
     when:
@@ -168,3 +241,4 @@ trigger:
 depends_on:
   - amd64
   - arm64
+  - s390x

Dockerfile.dapper

@@ -7,7 +7,7 @@ RUN apt-get update && \
     apt-get install -y gcc ca-certificates git wget curl vim less file && \
     rm -f /bin/sh && ln -s /bin/bash /bin/sh
 
-ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm=armv6l GOLANG_ARCH_arm64=arm64 GOLANG_ARCH=GOLANG_ARCH_${ARCH} \
+ENV GOLANG_ARCH_s390x=s390x GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm=armv6l GOLANG_ARCH_arm64=arm64 GOLANG_ARCH=GOLANG_ARCH_${ARCH} \
     GOPATH=/go PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash
 
 RUN wget -O - https://storage.googleapis.com/golang/go1.15.6.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local
@@ -20,7 +20,13 @@ ENV DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 \
     DOCKER_URL_arm64=https://github.com/rancher/docker/releases/download/v1.10.3-ros1/docker-1.10.3_arm64 \
     DOCKER_URL=DOCKER_URL_${ARCH}
 
-RUN wget -O - ${!DOCKER_URL} > /usr/bin/docker && chmod +x /usr/bin/docker
+RUN if [ "${ARCH}" == "s390x" ]; then \
+        curl -L https://download.docker.com/linux/static/stable/s390x/docker-18.06.3-ce.tgz | tar xzvf - && \
+        cp docker/docker /usr/bin/ && \
+        chmod +x /usr/bin/docker; \
+    else \
+        wget -O - ${!DOCKER_URL} > /usr/bin/docker && chmod +x /usr/bin/docker; \
+    fi
 
 ENV DAPPER_ENV CROSS DRONE_TAG
 ENV DAPPER_SOURCE /go/src/github.com/rancher/machine/

scripts/build

@@ -12,6 +12,7 @@ if [ "$CROSS" = 1 ]; then
     CGO_ENABLED=0 GOOS=windows go build -ldflags "-X main.VERSION=$VERSION" -o ./bin/rancher-machine-Windows-x86_64.exe ./cmd/rancher-machine
     CGO_ENABLED=0 GOARCH=arm64 go build -a -tags netgo -installsuffix netgo -ldflags "-X main.VERSION=$VERSION" -o ./bin/rancher-machine-Linux-arm64 ./cmd/rancher-machine
     CGO_ENABLED=0 GOARCH=ppc64le go build -a -tags netgo -installsuffix netgo -ldflags "-X main.VERSION=$VERSION" -o ./bin/rancher-machine-Linux-ppc64le ./cmd/rancher-machine
+    CGO_ENABLED=0 GOARCH=s390x go build -a -tags netgo -installsuffix netgo -ldflags "-X main.VERSION=$VERSION" -o ./bin/rancher-machine-Linux-s390x ./cmd/rancher-machine
     CGO_ENABLED=0 GOARCH=arm GOARM=6 go build -a -tags netgo -installsuffix netgo -ldflags "-X main.VERSION=$VERSION" -o ./bin/rancher-machine-Linux-arm ./cmd/rancher-machine
     CGO_ENABLED=0 GOARCH=arm GOARM=6 go build -a -tags netgo -installsuffix netgo -ldflags "-X main.VERSION=$VERSION" -o ./bin/rancher-machine-Linux-armv6l ./cmd/rancher-machine
     CGO_ENABLED=0 GOARCH=arm GOARM=7 go build -a -tags netgo -installsuffix netgo -ldflags "-X main.VERSION=$VERSION" -o ./bin/rancher-machine-Linux-armv7l ./cmd/rancher-machine