diff --git a/Dockerfile b/Dockerfile index 092e82a46..97c518ab3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,14 @@ # run with: # docker build -t lazygit . -# docker run -it lazygit:latest +# docker run -it lazygit:latest /bin/sh -l FROM golang:alpine +WORKDIR /go/src/github.com/jesseduffield/lazygit/ +COPY ./ . +RUN CGO_ENABLED=0 GOOS=linux go build -o lazygit . +FROM alpine:latest RUN apk add -U git xdg-utils - -ADD . /go/src/github.com/jesseduffield/lazygit - -RUN go install github.com/jesseduffield/lazygit - -WORKDIR /go/src/github.com/jesseduffield/lazygit \ No newline at end of file +WORKDIR /go/src/github.com/jesseduffield/lazygit/ +COPY --from=0 /go/src/github.com/jesseduffield/lazygit/lazygit /bin/ +RUN echo "alias gg=lazygit" >> ~/.profile diff --git a/pkg/commands/branch.go b/pkg/commands/branch.go index 49655c41a..419a106d2 100644 --- a/pkg/commands/branch.go +++ b/pkg/commands/branch.go @@ -22,7 +22,7 @@ type Branch struct { func (b *Branch) GetDisplayStrings() []string { displayName := utils.ColoredString(b.Name, b.GetColor()) if b.Selected && b.Pushables != "" && b.Pullables != "" { - displayName = fmt.Sprintf("↑%s↓%s %s", b.Pushables, b.Pullables, displayName) + displayName = fmt.Sprintf("%s ↑%s↓%s", displayName, b.Pushables, b.Pullables) } return []string{b.Recency, displayName}