Merge pull request #2 from antoniomika/am/zsh-and-other-fixes

Added ZSH and some other fixes

Author: antoniomika

.github/workflows/docker.yml

@@ -3,22 +3,22 @@ name: Docker Image CI
 on:
   push:
     tags:
-      - v*
+    - v*
     branches:
-    - master
+    - main
   pull_request:
     branches:
-    - master
+    - main
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
     - name: Lint the codebase
-      uses: golangci/golangci-lint-action@v1
+      uses: golangci/golangci-lint-action@v2
       with:
-        version: v1.31
+        version: latest
         args: -E goimports -E godot
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v1
@@ -48,7 +48,7 @@ jobs:
         fi
 
         DATE="$(date -u +%Y-%m-%dT%H:%M:%SZ)"
-        REF="${BRANCH_NAME:-master}"
+        REF="${BRANCH_NAME:-main}"
         OTHER_ARGS=""
         OTHER_PUSH_ARGS=""
 

.github/workflows/release.yml

@@ -5,10 +5,12 @@ on:
       - v*
 jobs:
   goreleaser:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
       - name: Set up Go
         uses: actions/setup-go@v2
         with:

Dockerfile

@@ -35,7 +35,7 @@ ENV GOOS=${TARGETOS} GOARCH=${TARGETARCH}
 
 RUN go build -o /go/bin/app -ldflags="-s -w -X github.com/${REPOSITORY}/cmd.Version=${VERSION} -X github.com/${REPOSITORY}/cmd.Commit=${COMMIT} -X github.com/${REPOSITORY}/cmd.Date=${DATE}"
 
-FROM alpine as release
+FROM snkshukla/alpine-zsh as release
 LABEL maintainer="Antonio Mika <[email protected]>"
 
 WORKDIR /app

README.md

@@ -43,7 +43,7 @@ This configuration will deploy [httpbin](https://httpbin.org) to be accessible f
 4. Add a remote that points to pcompose
     - `git remote add origin pcompose ssh://example.com:2222/user/httpbin`
 5. Push to the pcompose remote
-    - `git push pcompose master`
+    - `git push pcompose main`
 
 After step 5, you should see some output that looks like this:
 
@@ -57,7 +57,7 @@ Total 3 (delta 1), reused 0 (delta 0)
 remote: Creating user_httpbin_whoami_1 ... done
 remote:
 To ssh://example.com:2222/user/httpbin
-   95fae00..a34685d  master -> master
+   95fae00..a34685d  main -> main
 ```
 
 Once that's done, you should be ready to access your service at `https://http.example.com`

go.mod

@@ -1,20 +1,18 @@
 module github.com/antoniomika/pcompose
 
+go 1.15
+
 require (
-	github.com/antoniomika/sish v1.0.2
+	github.com/antoniomika/sish v1.1.5
 	github.com/creack/pty v1.1.11
 	github.com/fsnotify/fsnotify v1.4.9
-	github.com/json-iterator/go v1.1.10 // indirect
-	github.com/mitchellh/mapstructure v1.3.2 // indirect
-	github.com/phuslu/geoip v1.0.20200531 // indirect
-	github.com/sirupsen/logrus v1.6.0
-	github.com/spf13/cobra v1.0.0
-	github.com/spf13/viper v1.7.0
-	golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9
-	golang.org/x/sys v0.0.0-20200610111108-226ff32320da // indirect
-	google.golang.org/protobuf v1.24.0 // indirect
-	gopkg.in/ini.v1 v1.57.0 // indirect
+	github.com/sirupsen/logrus v1.7.0
+	github.com/spf13/cobra v1.1.3
+	github.com/spf13/viper v1.7.1
+	golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 )
 
-go 1.15
+replace github.com/pires/go-proxyproto => github.com/antoniomika/go-proxyproto v0.1.4-0.20210215223815-7210fcdac442
+
+replace github.com/vulcand/oxy => github.com/antoniomika/oxy v1.1.1-0.20210215225031-0afb828604bb

go.sum

@@ -84,7 +84,17 @@ func handlePostReceive(hookType, repoDir, oldRev, newRev, refName string) {
 			os.Exit(1)
 		}
 
-		resetCmd := exec.Command("git", "reset", "origin/master", "--hard")
+		mainBranchCmd := exec.Command("sh", "-c", "git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@'")
+		mainBranchCmd.Dir = deploymentDir
+		mainBranchCmd.Env = append(mainBranchCmd.Env, "GIT_DIR=.git")
+
+		mainBranch, err := mainBranchCmd.Output()
+		if err != nil {
+			log.Println("Error getting main branch:", err)
+			os.Exit(1)
+		}
+
+		resetCmd := exec.Command("git", "reset", fmt.Sprintf("origin/%s", mainBranch), "--hard")
 		resetCmd.Dir = deploymentDir
 		resetCmd.Env = append(resetCmd.Env, "GIT_DIR=.git")
 		err = resetCmd.Run()
@@ -130,5 +140,9 @@ func handlePostReceive(hookType, repoDir, oldRev, newRev, refName string) {
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 
-	_ = cmd.Run()
+	err = cmd.Run()
+	if err != nil {
+		log.Println("Error running docker-compose up:", err)
+		os.Exit(1)
+	}
 }

hook/hook.go

@@ -166,10 +166,14 @@ func handleRequest(sshConn *pUtils.SSHConnHolder, newRequest *ssh.Request, chann
 					"-e",
 					fmt.Sprintf("COMPOSE_PROJECT_NAME=%s", strings.ReplaceAll(containerName, string(os.PathSeparator), "_")),
 					viper.GetString("pcompose-container-name"),
-					"/bin/sh",
+					"/bin/zsh",
 				}...)
 			} else {
-				cmd = exec.Command("docker", "exec", "-it", containerName, "/bin/sh")
+				realCmd := "/bin/sh"
+				if containerName == viper.GetString("pcompose-container-name") {
+					realCmd = "/bin/zsh"
+				}
+				cmd = exec.Command("docker", "exec", "-it", containerName, realCmd)
 			}
 		}