git-pr

created pr with 58.1 on 2025-04-06T00:58:38Z · by 964fa508

cmds

checkout latest patchset:

ssh pr.pico.sh print 58 | git am -3

checkout any patchset in a patch request:

ssh pr.pico.sh print 58.[rev] | git am -3

add changes to patch request:

git format-patch main --stdout | ssh pr.pico.sh pr add 58

Patchset `58.1` on 2025-04-06T00:58:38Z · commit fc8323b

→ rename binaries

jolheiser 2025-04-06T00:55:44Z

rename binaries

jolheiser 2025-04-06T00:55:44Z

Rename the binaries to avoid any potential for "ssh" (or "web") binaries.
In particular, "ssh" could conflict with openssh and lead to confusing behavior.

Signed-off-by: jolheiser <git@jolheiser.com>

Semantic diff summary

0 added, 0 modified, 0 signature changed, 0 removed across 2 analyzed files (4 files skipped: unsupported file type)

+1 -1 Caddyfile #

......@@ -48,6 +48,6 @@
}

:443 {
	reverse_proxy web:3000
	reverse_proxy git-web:3000
	encode zstd gzip
}

+5 -5 Dockerfile #

......@@ -22,7 +22,7 @@ ENV LDFLAGS="-s -w"

ENV GOOS=${TARGETOS} GOARCH=${TARGETARCH}

RUN go build -ldflags "$LDFLAGS" -o /go/bin/web ./cmd/web
RUN go build -ldflags "$LDFLAGS" -o /go/bin/git-web ./cmd/git-web

FROM builder-deps as builder-ssh

......@@ -36,14 +36,14 @@ ENV LDFLAGS="-s -w"

ENV GOOS=${TARGETOS} GOARCH=${TARGETARCH}

RUN go build -ldflags "$LDFLAGS" -o /go/bin/ssh ./cmd/ssh
RUN go build -ldflags "$LDFLAGS" -o /go/bin/git-ssh ./cmd/git-ssh

FROM scratch as release-web

WORKDIR /app

COPY --from=builder-web /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=builder-web /go/bin/web ./web
COPY --from=builder-web /go/bin/git-web ./git-web

CMD ["/app/web"]

......@@ -53,6 +53,6 @@ WORKDIR /app
ENV TERM="xterm-256color"

COPY --from=builder-ssh /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=builder-ssh /go/bin/ssh ./ssh
COPY --from=builder-ssh /go/bin/git-ssh ./git-ssh

CMD ["/app/ssh"]
CMD ["/app/git-ssh"]

+2 -2 Makefile #

......@@ -21,8 +21,8 @@ snapshot:
.PHONY: snapshot

build:
	go build -o ./build/ssh ./cmd/ssh
	go build -o ./build/web ./cmd/web
	go build -o ./build/git-ssh ./cmd/git-ssh
	go build -o ./build/git-web ./cmd/git-web
.PHONY: build

bp-setup:

+0 -0 cmd/git-ssh/main.go #

+0 -0 cmd/git-web/main.go #

+2 -2 docker-compose.prod.yml #

......@@ -19,7 +19,7 @@ services:
      - "${GITPR_HTTPS_V6:-[::1]:443}:443"
      - "${GITPR_HTTP_V6:-[::1]:80}:80"
  web:
    command: "/app/web --config ${GITPR_CONFIG_PATH}"
    command: "/app/git-web --config ${GITPR_CONFIG_PATH}"
    networks:
      git:
        aliases:

......@@ -27,7 +27,7 @@ services:
    env_file:
      - .env.prod
  ssh:
    command: "/app/ssh --config ${GITPR_CONFIG_PATH}"
    command: "/app/git-ssh --config ${GITPR_CONFIG_PATH}"
    networks:
      git:
        aliases:

...	...		@@ -48,6 +48,6 @@
48	48		}
49	49
50	50		:443 {
51		-	reverse_proxy web:3000
	51	+	reverse_proxy git-web:3000
52	52		encode zstd gzip
53	53		}

...	...		@@ -22,7 +22,7 @@ ENV LDFLAGS="-s -w"
22	22
23	23		ENV GOOS=${TARGETOS} GOARCH=${TARGETARCH}
24	24
25		-	RUN go build -ldflags "$LDFLAGS" -o /go/bin/web ./cmd/web
	25	+	RUN go build -ldflags "$LDFLAGS" -o /go/bin/git-web ./cmd/git-web
26	26
27	27		FROM builder-deps as builder-ssh
28	28

...	...		@@ -36,14 +36,14 @@ ENV LDFLAGS="-s -w"
36	36
37	37		ENV GOOS=${TARGETOS} GOARCH=${TARGETARCH}
38	38
39		-	RUN go build -ldflags "$LDFLAGS" -o /go/bin/ssh ./cmd/ssh
	39	+	RUN go build -ldflags "$LDFLAGS" -o /go/bin/git-ssh ./cmd/git-ssh
40	40
41	41		FROM scratch as release-web
42	42
43	43		WORKDIR /app
44	44
45	45		COPY --from=builder-web /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
46		-	COPY --from=builder-web /go/bin/web ./web
	46	+	COPY --from=builder-web /go/bin/git-web ./git-web
47	47
48	48		CMD ["/app/web"]
49	49

...	...		@@ -53,6 +53,6 @@ WORKDIR /app
53	53		ENV TERM="xterm-256color"
54	54
55	55		COPY --from=builder-ssh /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
56		-	COPY --from=builder-ssh /go/bin/ssh ./ssh
	56	+	COPY --from=builder-ssh /go/bin/git-ssh ./git-ssh
57	57
58		-	CMD ["/app/ssh"]
	58	+	CMD ["/app/git-ssh"]

...	...		@@ -21,8 +21,8 @@ snapshot:
21	21		.PHONY: snapshot
22	22
23	23		build:
24		-	go build -o ./build/ssh ./cmd/ssh
25		-	go build -o ./build/web ./cmd/web
	24	+	go build -o ./build/git-ssh ./cmd/git-ssh
	25	+	go build -o ./build/git-web ./cmd/git-web
26	26		.PHONY: build
27	27
28	28		bp-setup:

...	...		@@ -19,7 +19,7 @@ services:
19	19		- "${GITPR_HTTPS_V6:-[::1]:443}:443"
20	20		- "${GITPR_HTTP_V6:-[::1]:80}:80"
21	21		web:
22		-	command: "/app/web --config ${GITPR_CONFIG_PATH}"
	22	+	command: "/app/git-web --config ${GITPR_CONFIG_PATH}"
23	23		networks:
24	24		git:
25	25		aliases:

...	...		@@ -27,7 +27,7 @@ services:
27	27		env_file:
28	28		- .env.prod
29	29		ssh:
30		-	command: "/app/ssh --config ${GITPR_CONFIG_PATH}"
	30	+	command: "/app/git-ssh --config ${GITPR_CONFIG_PATH}"
31	31		networks:
32	32		git:
33	33		aliases:

git-pr

Patchset 58.1 on 2025-04-06T00:58:38Z · commit fc8323b

Patchset `58.1` on 2025-04-06T00:58:38Z · commit fc8323b