diff --git a/Dockerfile b/Dockerfile index 1bdee3f..43ca944 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,17 @@ -ARG GO_VERSION=1.12.12 +ARG GO_VERSION=1.13.0 # OS-X SDK parameters # NOTE: when changing version here, make sure to also change OSX_CODENAME below to match -ARG OSX_SDK=MacOSX10.10.sdk -ARG OSX_SDK_SUM=631b4144c6bf75bf7a4d480d685a9b5bda10ee8d03dbf0db829391e2ef858789 +ARG OSX_SDK=MacOSX10.11.sdk +ARG OSX_SDK_SUM=98cdd56e0f6c1f9e1af25e11dd93d2e7d306a4aa50430a2bc6bc083ac67efbb8 -# OSX-cross parameters. Go 1.11 requires OSX >= 10.10 -ARG OSX_VERSION_MIN=10.10 +# OSX-cross parameters. Go 1.13 requires OSX >= 10.11 +ARG OSX_VERSION_MIN=10.11 ARG OSX_CROSS_COMMIT=a9317c18a3a457ca0a657f08cc4d0d43c6cf8953 # Libtool parameters ARG LIBTOOL_VERSION=2.4.6 -ARG OSX_CODENAME=yosemite +ARG OSX_CODENAME=el_capitan FROM golang:${GO_VERSION}-buster AS base ARG APT_MIRROR @@ -22,7 +22,9 @@ ENV OSX_CROSS_PATH=/osxcross FROM base AS osx-sdk ARG OSX_SDK ARG OSX_SDK_SUM -ADD https://s3.dockerproject.org/darwin/v2/${OSX_SDK}.tar.xz "${OSX_CROSS_PATH}/tarballs/${OSX_SDK}.tar.xz" +# ADD https://s3.dockerproject.org/darwin/v2/${OSX_SDK}.tar.xz "${OSX_CROSS_PATH}/tarballs/${OSX_SDK}.tar.xz" +# FIXME: upload to s3.dockerproject.org +ADD https://github.com/ndeloof/golang-cross/raw/113fix/${OSX_SDK}.tar.xz "${OSX_CROSS_PATH}/tarballs/${OSX_SDK}.tar.xz" RUN echo "${OSX_SDK_SUM}" "${OSX_CROSS_PATH}/tarballs/${OSX_SDK}.tar.xz" | sha256sum -c - FROM base AS osx-cross-base