Browse Source

fix #1195

tags/v2.3.0-rc1
Shivaram Lingamneni 3 years ago
parent
commit
b594ec05e6
4 changed files with 4 additions and 4 deletions
  1. 1
    1
      .travis.yml
  2. 1
    1
      DEVELOPING.md
  3. 1
    1
      Dockerfile
  4. 1
    1
      go.mod

+ 1
- 1
.travis.yml View File

@@ -1,7 +1,7 @@
1 1
 language: go
2 2
 
3 3
 go:
4
-    - "1.14.x"
4
+    - "1.15.x"
5 5
 
6 6
 before_install:
7 7
   # https://github.com/travis-ci/travis-ci/issues/8361

+ 1
- 1
DEVELOPING.md View File

@@ -12,7 +12,7 @@ Oragono vendors all its dependencies. Because of this, Oragono is self-contained
12 12
 If you're upgrading the Go version used by Oragono, there are several places where it's hard-coded and must be changed:
13 13
 
14 14
 1. `.travis.yml`, which controls the version that our CI test suite uses to build and test the code (e.g., for a PR)
15
-2. `distrib/docker/Dockerfile`, which controls the version that the Oragono binaries in our Docker images are built with
15
+2. `Dockerfile`, which controls the version that the Oragono binaries in our Docker images are built with
16 16
 3. `go.mod`: this should be updated automatically by Go when you do module-related operations
17 17
 
18 18
 

+ 1
- 1
Dockerfile View File

@@ -1,5 +1,5 @@
1 1
 ## build Oragono
2
-FROM golang:1.14-alpine AS build-env
2
+FROM golang:1.15-alpine AS build-env
3 3
 
4 4
 RUN apk add --no-cache git make curl sed
5 5
 

+ 1
- 1
go.mod View File

@@ -1,6 +1,6 @@
1 1
 module github.com/oragono/oragono
2 2
 
3
-go 1.14
3
+go 1.15
4 4
 
5 5
 require (
6 6
 	code.cloudfoundry.org/bytefmt v0.0.0-20200131002437-cf55d5288a48

Loading…
Cancel
Save