remove support i386

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>

.drone.yml

@@ -9,7 +9,7 @@ platform:
 steps:
 - name: vet
   pull: always
-  image: golang:1.14
+  image: golang:1.15
   commands:
   - make vet
   volumes:
@@ -18,7 +18,7 @@ steps:
 
 - name: lint
   pull: always
-  image: golang:1.14
+  image: golang:1.15
   commands:
   - make lint
   volumes:
@@ -27,7 +27,7 @@ steps:
 
 - name: misspell
   pull: always
-  image: golang:1.14
+  image: golang:1.15
   commands:
   - make misspell-check
   volumes:
@@ -36,7 +36,7 @@ steps:
 
 - name: test
   pull: always
-  image: golang:1.14-alpine
+  image: golang:1.15-alpine
   commands:
   - apk add git make curl perl bash build-base zlib-dev ucl-dev
   - make ssh-server
@@ -68,9 +68,9 @@ platform:
 steps:
 - name: build-push
   pull: always
-  image: golang:1.14
+  image: golang:1.15
   commands:
-  - go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/amd64/drone-ssh
+  - "go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/amd64/drone-ssh"
   environment:
     CGO_ENABLED: 0
   when:
@@ -80,9 +80,9 @@ steps:
 
 - name: build-tag
   pull: always
-  image: golang:1.14
+  image: golang:1.15
   commands:
-  - go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/amd64/drone-ssh
+  - "go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/amd64/drone-ssh"
   environment:
     CGO_ENABLED: 0
   when:
@@ -91,7 +91,7 @@ steps:
 
 - name: executable
   pull: always
-  image: golang:1.14
+  image: golang:1.15
   commands:
   - ./release/linux/amd64/drone-ssh --help
 
@@ -130,8 +130,8 @@ steps:
 trigger:
   ref:
   - refs/heads/master
-  - refs/pull/**
-  - refs/tags/**
+  - "refs/pull/**"
+  - "refs/tags/**"
 
 depends_on:
 - testing
@@ -147,9 +147,9 @@ platform:
 steps:
 - name: build-push
   pull: always
-  image: golang:1.14
+  image: golang:1.15
   commands:
-  - go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm64/drone-ssh
+  - "go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm64/drone-ssh"
   environment:
     CGO_ENABLED: 0
   when:
@@ -159,9 +159,9 @@ steps:
 
 - name: build-tag
   pull: always
-  image: golang:1.14
+  image: golang:1.15
   commands:
-  - go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm64/drone-ssh
+  - "go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm64/drone-ssh"
   environment:
     CGO_ENABLED: 0
   when:
@@ -170,7 +170,7 @@ steps:
 
 - name: executable
   pull: always
-  image: golang:1.14
+  image: golang:1.15
   commands:
   - ./release/linux/arm64/drone-ssh --help
 
@@ -209,8 +209,8 @@ steps:
 trigger:
   ref:
   - refs/heads/master
-  - refs/pull/**
-  - refs/tags/**
+  - "refs/pull/**"
+  - "refs/tags/**"
 
 depends_on:
 - testing
@@ -226,9 +226,9 @@ platform:
 steps:
 - name: build-push
   pull: always
-  image: golang:1.14
+  image: golang:1.15
   commands:
-  - go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm/drone-ssh
+  - "go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm/drone-ssh"
   environment:
     CGO_ENABLED: 0
   when:
@@ -238,9 +238,9 @@ steps:
 
 - name: build-tag
   pull: always
-  image: golang:1.14
+  image: golang:1.15
   commands:
-  - go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm/drone-ssh
+  - "go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm/drone-ssh"
   environment:
     CGO_ENABLED: 0
   when:
@@ -249,7 +249,7 @@ steps:
 
 - name: executable
   pull: always
-  image: golang:1.14
+  image: golang:1.15
   commands:
   - ./release/linux/arm/drone-ssh --help
 
@@ -288,8 +288,8 @@ steps:
 trigger:
   ref:
   - refs/heads/master
-  - refs/pull/**
-  - refs/tags/**
+  - "refs/pull/**"
+  - "refs/tags/**"
 
 depends_on:
 - testing
@@ -305,7 +305,7 @@ platform:
 steps:
 - name: build-all-binary
   pull: always
-  image: golang:1.14
+  image: golang:1.15
   commands:
   - make release
   when:
@@ -319,14 +319,14 @@ steps:
     api_key:
       from_secret: github_release_api_key
     files:
-    - dist/release/*
+    - "dist/release/*"
   when:
     event:
     - tag
 
 trigger:
   ref:
-  - refs/tags/**
+  - "refs/tags/**"
 
 depends_on:
 - testing
@@ -354,7 +354,7 @@ steps:
 trigger:
   ref:
   - refs/heads/master
-  - refs/tags/**
+  - "refs/tags/**"
 
 depends_on:
 - linux-amd64

DOCS.md

@@ -112,6 +112,8 @@ Example configuration for exporting custom secrets:
 ```diff
   - name: ssh commands
     image: appleboy/drone-ssh
+    environment:
+      commit: ${DRONE_BUILD_NUMBER}
     settings:
       host: foo.com
       username: root
@@ -119,8 +121,10 @@ Example configuration for exporting custom secrets:
       port: 22
 +     envs:
         - aws_access_key_id
+        - commit
       script:
         - export AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID
+        - echo $commit
 ```
 
 Example configuration for stoping script after first failure:

Makefile

@@ -8,7 +8,7 @@ DEPLOY_ACCOUNT := appleboy
 DEPLOY_IMAGE := $(EXECUTABLE)
 
 TARGETS ?= linux darwin windows
-ARCHS ?= amd64 386
+ARCHS ?= amd64
 SOURCES ?= $(shell find . -name "*.go" -type f)
 TAGS ?=
 LDFLAGS ?= -X 'main.Version=$(VERSION)'

pipeline.libsonnet

@@ -9,7 +9,7 @@
     steps: [
       {
         name: 'vet',
-        image: 'golang:1.14',
+        image: 'golang:1.15',
         pull: 'always',
         commands: [
           'make vet',
@@ -23,7 +23,7 @@
       },
       {
         name: 'lint',
-        image: 'golang:1.14',
+        image: 'golang:1.15',
         pull: 'always',
         commands: [
           'make lint',
@@ -37,7 +37,7 @@
       },
       {
         name: 'misspell',
-        image: 'golang:1.14',
+        image: 'golang:1.15',
         pull: 'always',
         commands: [
           'make misspell-check',
@@ -51,7 +51,7 @@
       },
       {
         name: 'test',
-        image: 'golang:1.14-alpine',
+        image: 'golang:1.15-alpine',
         pull: 'always',
         commands: [
           'apk add git make curl perl bash build-base zlib-dev ucl-dev',
@@ -93,7 +93,7 @@
     steps: [
       {
         name: 'build-push',
-        image: 'golang:1.14',
+        image: 'golang:1.15',
         pull: 'always',
         environment: {
           CGO_ENABLED: '0',
@@ -109,7 +109,7 @@
       },
       {
         name: 'build-tag',
-        image: 'golang:1.14',
+        image: 'golang:1.15',
         pull: 'always',
         environment: {
           CGO_ENABLED: '0',
@@ -123,7 +123,7 @@
       },
       {
         name: 'executable',
-        image: 'golang:1.14',
+        image: 'golang:1.15',
         pull: 'always',
         commands: [
           './release/' + os + '/' + arch + '/' + name + ' --help',
@@ -188,7 +188,7 @@
     steps: [
       {
         name: 'build-all-binary',
-        image: 'golang:1.14',
+        image: 'golang:1.15',
         pull: 'always',
         commands: [
           'make release'

plugin.go

@@ -54,13 +54,25 @@ func escapeArg(arg string) string {
 	return "'" + strings.Replace(arg, "'", `'\''`, -1) + "'"
 }
 
+func (p Plugin) hostPort(host string) (string, string) {
+	hosts := strings.Split(host, ":")
+	port := strconv.Itoa(p.Config.Port)
+	if len(hosts) > 1 {
+		host = hosts[0]
+		port = hosts[1]
+	}
+
+	return host, port
+}
+
 func (p Plugin) exec(host string, wg *sync.WaitGroup, errChannel chan error) {
+	host, port := p.hostPort(host)
 	// Create MakeConfig instance with remote username, server address and path to private key.
 	ssh := &easyssh.MakeConfig{
 		Server:            host,
 		User:              p.Config.Username,
 		Password:          p.Config.Password,
-		Port:              strconv.Itoa(p.Config.Port),
+		Port:              port,
 		Key:               p.Config.Key,
 		KeyPath:           p.Config.KeyPath,
 		Passphrase:        p.Config.Passphrase,

plugin_test.go

@@ -715,3 +715,62 @@ func TestUseInsecureCipher(t *testing.T) {
 
 	assert.Equal(t, unindent(expected), unindent(buffer.String()))
 }
+
+func TestPlugin_hostPort(t *testing.T) {
+	type fields struct {
+		Config Config
+		Writer io.Writer
+	}
+	type args struct {
+		h string
+	}
+	tests := []struct {
+		name     string
+		fields   fields
+		args     args
+		wantHost string
+		wantPort string
+	}{
+		{
+			name: "default host and port",
+			fields: fields{
+				Config: Config{
+					Port: 22,
+				},
+			},
+			args: args{
+				h: "localhost",
+			},
+			wantHost: "localhost",
+			wantPort: "22",
+		},
+		{
+			name: "different port",
+			fields: fields{
+				Config: Config{
+					Port: 22,
+				},
+			},
+			args: args{
+				h: "localhost:443",
+			},
+			wantHost: "localhost",
+			wantPort: "443",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			p := Plugin{
+				Config: tt.fields.Config,
+				Writer: tt.fields.Writer,
+			}
+			gotHost, gotPort := p.hostPort(tt.args.h)
+			if gotHost != tt.wantHost {
+				t.Errorf("Plugin.hostPort() gotHost = %v, want %v", gotHost, tt.wantHost)
+			}
+			if gotPort != tt.wantPort {
+				t.Errorf("Plugin.hostPort() gotPort = %v, want %v", gotPort, tt.wantPort)
+			}
+		})
+	}
+}