Merge pull request #1236 from slingamn/issue1195_go_upgrade

fix #1195
ergochat · Aug 12, 2020 · 385993f · 385993f
2 parents c55b25d + b594ec0
commit 385993f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: go
 
 go:
-    - "1.14.x"
+    - "1.15.x"
 
 before_install:
   # https://github.com/travis-ci/travis-ci/issues/8361

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

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 ## build Oragono
-FROM golang:1.14-alpine AS build-env
+FROM golang:1.15-alpine AS build-env
 
 RUN apk add --no-cache git make curl sed
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/oragono/oragono
 
-go 1.14
+go 1.15
 
 require (
 	code.cloudfoundry.org/bytefmt v0.0.0-20200131002437-cf55d5288a48