From 367f8532b1bc02e2dfdbeaa15ad81bdb88ea9933 Mon Sep 17 00:00:00 2001 From: Roland Singer Date: Fri, 25 Oct 2019 12:04:43 +0200 Subject: [PATCH] updated docker containers --- docker/common/base | 4 ++-- docker/linux/Dockerfile | 4 ++-- docker/windows/Dockerfile | 6 +++--- docker/windows/Dockerfile.in | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/common/base b/docker/common/base index ade0aa1..c032420 100644 --- a/docker/common/base +++ b/docker/common/base @@ -1,6 +1,6 @@ # Install the Go compiler. -RUN export GO_VERSION="1.12.7" && \ - export GO_CHECKSUM="66d83bfb5a9ede000e33c6579a91a29e6b101829ad41fffb5c5bb6c900e109d9" && \ +RUN export GO_VERSION="1.13.3" && \ + export GO_CHECKSUM="0804bf02020dceaa8a7d7275ee79f7a142f1996bfd0c39216ccb405f93f994c0" && \ mkdir -p /tmp/go && \ cd /tmp/go && \ wget -O go.tar.gz https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz && \ diff --git a/docker/linux/Dockerfile b/docker/linux/Dockerfile index 66ba8cd..98d12bc 100644 --- a/docker/linux/Dockerfile +++ b/docker/linux/Dockerfile @@ -8,8 +8,8 @@ RUN apt-get -y update && \ apt-get -y clean # Install the Go compiler. -RUN export GO_VERSION="1.12.7" && \ - export GO_CHECKSUM="66d83bfb5a9ede000e33c6579a91a29e6b101829ad41fffb5c5bb6c900e109d9" && \ +RUN export GO_VERSION="1.13.3" && \ + export GO_CHECKSUM="0804bf02020dceaa8a7d7275ee79f7a142f1996bfd0c39216ccb405f93f994c0" && \ mkdir -p /tmp/go && \ cd /tmp/go && \ wget -O go.tar.gz https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz && \ diff --git a/docker/windows/Dockerfile b/docker/windows/Dockerfile index 54a0427..fd0c1a8 100644 --- a/docker/windows/Dockerfile +++ b/docker/windows/Dockerfile @@ -42,8 +42,8 @@ RUN apt-get -y update && \ apt-get -y clean # Install the Go compiler. -RUN export GO_VERSION="1.12.7" && \ - export GO_CHECKSUM="66d83bfb5a9ede000e33c6579a91a29e6b101829ad41fffb5c5bb6c900e109d9" && \ +RUN export GO_VERSION="1.13.3" && \ + export GO_CHECKSUM="0804bf02020dceaa8a7d7275ee79f7a142f1996bfd0c39216ccb405f93f994c0" && \ mkdir -p /tmp/go && \ cd /tmp/go && \ wget -O go.tar.gz https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz && \ @@ -78,7 +78,7 @@ CMD ["gml"] # https://mxe.cc # https://stackoverflow.com/questions/14170590/building-qt-5-on-linux-for-windows/14170591#14170591 -RUN export MXE_COMMIT="ebd730a60f0be990878d862332544cc8d5d93ace" && \ +RUN export MXE_COMMIT="2a4803f50e86540e0d006f8efe50391874e5abfe" && \ git clone https://github.com/mxe/mxe.git /mxe && \ cd /mxe && \ git checkout "${MXE_COMMIT}" diff --git a/docker/windows/Dockerfile.in b/docker/windows/Dockerfile.in index 20e132b..56a4f76 100644 --- a/docker/windows/Dockerfile.in +++ b/docker/windows/Dockerfile.in @@ -45,7 +45,7 @@ RUN apt-get -y update && \ # https://mxe.cc # https://stackoverflow.com/questions/14170590/building-qt-5-on-linux-for-windows/14170591#14170591 -RUN export MXE_COMMIT="ebd730a60f0be990878d862332544cc8d5d93ace" && \ +RUN export MXE_COMMIT="2a4803f50e86540e0d006f8efe50391874e5abfe" && \ git clone https://github.com/mxe/mxe.git /mxe && \ cd /mxe && \ git checkout "${MXE_COMMIT}"