Merge pull request #18 from lucor/feature/go-update

Update Go to v1.14.13 and linux deps
fyne-io · Dec 13, 2020 · aea6085 · aea6085
2 parents 2f120e1 + b36aee3
commit aea6085
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,14 @@
 # Changelog - Fyne.io fyne-cross
 
-## Unreleased
+## [1.0.0]
 - Add support for "fyne release" #3
 - Add support for creating packaged .tar.gz bundles on freebsd #6
 - Add support for Linux Wayland #10
-- Update fyne cli to v1.4.2-0.20201204171445-8f33697cf611 (fyne-io#1538 fyne-io#1527)
+- Update fyne cli to v1.4.2 (fyne-io#1538 fyne-io#1527)
 - Deprecate `output` flag in favour of `name`
 - Fix env flag validation #14
+- Fix build failure for Linux mobile #19
+- Update Go to v1.14.13
 
 ## [0.9.0]
 - Releaseing under project namespace with previous 2.2.1 becoming 0.9.0 in fyne-io namespace

diff --git a/docker/CHANGELOG.md b/docker/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to the fyne-cross docker images will be documented in this f
 Release cycle won't follow the fyne-cross one, so the images will be tagged using the label
 year.month.day along with the latest one.
 
+# Release 20.12.13
+- Update Go to v1.14.13
+- Fix build failure for Linux mobile #19
+
+# Release 20.12.10
+- Update fyne cli to v1.4.2
+> Note: this version is the last that provides Go v1.13.x
+
 # Release 20.12.05
 - Update fyne cli to v1.4.2-0.20201204171445-8f33697cf611
 - Add support for Linux Wayland #10

diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
@@ -1,7 +1,7 @@
 # docker cross 1.13.15
 ARG DOCKER_CROSS_VERSION=sha256:11a04661d910f74c419623ef7880024694f9151c17578af15e86c45cdf6c8588
 # fyne stable branch
-ARG FYNE_VERSION=8f33697cf6117da329412c6614e188fa55423b85
+ARG FYNE_VERSION=v1.4.2
 
 # Build the fyne command utility
 FROM dockercore/golang-cross@${DOCKER_CROSS_VERSION} AS fyne
@@ -14,16 +14,21 @@ WORKDIR /app
 COPY . .
 RUN GO111MODULE=on go build -o /go/bin/gowindres -ldflags="-w -s" ./internal/cmd/gowindres
 
+FROM golang:1.14.13-buster AS golang
+
 # Build the fyne-cross base image
 FROM dockercore/golang-cross@${DOCKER_CROSS_VERSION}
 
 COPY --from=fyne /go/bin/fyne /usr/local/bin
 COPY --from=gowindres /go/bin/gowindres /usr/local/bin
+RUN rm -rf /usr/local/go
+COPY --from=golang /usr/local/go /usr/local/go
 
 RUN apt-get update -qq \
     && apt-get install -y -q --no-install-recommends \
         libgl1-mesa-dev \
         libegl1-mesa-dev \
+        libgles2-mesa-dev \
         xorg-dev \
         gosu \
         zip \

diff --git a/docker/linux-386/Dockerfile b/docker/linux-386/Dockerfile
@@ -6,6 +6,7 @@ RUN dpkg --add-architecture i386 \
         gccgo-i686-linux-gnu \
         libgl1-mesa-dev:i386 \
         libegl1-mesa-dev:i386 \
+        libgles2-mesa-dev:i386 \
         libdmx-dev:i386 \
         libfontenc-dev:i386 \
         libfs-dev:i386 \

diff --git a/docker/linux-arm/Dockerfile b/docker/linux-arm/Dockerfile
@@ -6,6 +6,7 @@ RUN dpkg --add-architecture armhf \
         gccgo-arm-linux-gnueabihf \
         libgl1-mesa-dev:armhf \
         libegl1-mesa-dev:armhf \
+        libgles2-mesa-dev:armhf \
         libdmx-dev:armhf \
         libfontenc-dev:armhf \
         libfs-dev:armhf \

diff --git a/docker/linux-arm64/Dockerfile b/docker/linux-arm64/Dockerfile
@@ -6,6 +6,7 @@ RUN dpkg --add-architecture arm64 \
         gccgo-aarch64-linux-gnu \
         libgl1-mesa-dev:arm64 \
         libegl1-mesa-dev:arm64 \
+        libgles2-mesa-dev:arm64 \
         libdmx-dev:arm64 \
         libfontenc-dev:arm64 \
         libfs-dev:arm64 \