diff options
| author | Dawid Dziurla <dawidd0811@gmail.com> | 2019-10-27 08:51:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-27 08:51:03 +0100 |
| commit | 63da8f48da4bd1bbf6d73b4ab689989011940966 (patch) | |
| tree | 5c730fec38b42675787f5180e0f328d958fff75c | |
| parent | a1c66194012d92cf24cc00cd021f654b958a3371 (diff) | |
| parent | 32d6a17240a9b6810b8bfc6805b5fa02644337e9 (diff) | |
Merge pull request #522 from chenrui333/go-1.13
| -rw-r--r-- | .circleci/config.yml | 4 | ||||
| -rw-r--r-- | Dockerfile | 4 | ||||
| -rw-r--r-- | go.mod | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 7cdd01346..c858c6a0c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: build: docker: - - image: circleci/golang:1.12 + - image: circleci/golang:1.13 environment: GO111MODULE: "on" working_directory: /go/src/github.com/jesseduffield/lazygit @@ -38,7 +38,7 @@ jobs: release: docker: - - image: circleci/golang:1.12 + - image: circleci/golang:1.13 working_directory: /go/src/github.com/jesseduffield/lazygit steps: - checkout diff --git a/Dockerfile b/Dockerfile index 12e33e4d5..a85e4f20f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,12 @@ # docker build -t lazygit . # docker run -it lazygit:latest /bin/sh -l -FROM golang:alpine +FROM golang:1.13-alpine3.10 WORKDIR /go/src/github.com/jesseduffield/lazygit/ COPY ./ . RUN CGO_ENABLED=0 GOOS=linux go build -FROM alpine:latest +FROM alpine:3.10 RUN apk add -U git xdg-utils WORKDIR /go/src/github.com/jesseduffield/lazygit/ COPY --from=0 /go/src/github.com/jesseduffield/lazygit /go/src/github.com/jesseduffield/lazygit @@ -1,6 +1,6 @@ module github.com/jesseduffield/lazygit -go 1.12 +go 1.13 require ( github.com/BurntSushi/toml v0.3.1 // indirect |