Docker images refactoring #37

lucor · 2021-03-18T18:46:04Z

This PR ports the refactoring for the docker images done in #34 in order to support the latest versions of Go and macOS SDKs.
Since it introduces several features, it could be useful to merge in develop and make generally available.

Details:

Add FreeBSD on arm64 target Add FreeBSD on arm64 target #29
Add the darwin-image command to build the darwin docker image
Add a dedicated docker image for windows
Update Go to v1.16.2
Update fyne CLI to v2.0.1
Update FreeBSD to v12.2 Add FreeBSD on arm64 target #29
Remove darwin 386 target
Remove the dependency from the docker/golang-cross image for the base image
Refactor docker images layout to ensure compatibility with previous versions of fyne-cross

Docker images available in docker hub for testing:

fyneio/fyne-cross:1.1-base
fyneio/fyne-cross:1.1-base-llvm
fyneio/fyne-cross:1.1-base-freebsd
fyneio/fyne-cross:1.1-android
fyneio/fyne-cross:1.1-linux-arm64
fyneio/fyne-cross:1.1-linux-arm
fyneio/fyne-cross:1.1-linux-386
fyneio/fyne-cross:1.1-freebsd-arm64
fyneio/fyne-cross:1.1-freebsd-amd64
fyneio/fyne-cross:1.1-windows

This commit add support for the darwin arm64 target. Additionally provides: - Update Go to v1.16.0 - Update fyne cli to v2.0.1 - Add darwin arm64 target - Remove darwin 386 target Fixes fyne-io#33

This reverts commit f9ae7eb.

Refactor docker images layout to ensure compatibility with previous versions of fyne-cross. In the details: - Add FreeBSD on arm64 target fyne-io#29 - Add the `darwin-image` command to build the darwin docker image - Add a dedicated docker image for windows - Update Go to v1.16.2 - Update fyne CLI to v2.0.1 - Update FreeBSD to v12.2 fyne-io#29 - Remove darwin 386 target - Remove the dependency from the docker/golang-cross image for the base image

andydotxyz · 2021-03-18T20:30:08Z

Building the darwin image relies on Xcode.dmg. But if this is run on a mac they will be installed so the dmg file is gone but the SDK is available installed. Is there some way it could support both?

When building from macOS the SDK could be already available on the host. This commit adds the `-no-docker` options to build directly from the host using the fyne CLI tool without using any docker image.

lucor · 2021-03-19T19:18:31Z

Good point, added the no-docker flag, available only for macOS.
When specified fyne-cross will build and package using a local installation of the fyne CLI tool instead of the docker image.

Not 100% sure about the no-docker name for the flag, any suggestion is welcome.

Jacalz · 2021-03-20T17:01:50Z

Not 100% sure about the no-docker name for the flag, any suggestion is welcome.

Hmm. How about -local, -local-sdk, -local-tools or something along those lines?

Jacalz

Looking really good. Will tests compiling later, but now I just had some suggestion to the docs.

CHANGELOG.md

README.md

docker/CHANGELOG.md

andydotxyz · 2021-03-20T19:15:08Z

Regarding wrapping the Fyne code in general tries to keep to around 120 Cols, though it’s not enforced.
Navigating long lines in markdown with a cli text editor is painful.

Jacalz · 2021-03-20T20:36:50Z

I just thought that it can be jarring to read manually wrapped text in some situations (save seen that on some sites), but I now see that GitHub handles it rather well in these situations. Most of my wrapping related comments are probably unnecessary then.

andydotxyz · 2021-03-21T10:30:24Z

It's part of the markdown spec that a single newline is not a break in the output content.

Co-authored-by: Jacob <Jacalz@users.noreply.github.com>

Jacalz · 2021-03-21T17:06:10Z

It's part of the markdown spec that a single newline is not a break in the output content.

Oh, yes. Might just have been good old Phanicator having some issues 😅

lucor · 2021-03-21T17:44:00Z

Thanks for feedback
Latest commits should address your suggestions. Updated to the use the -local flag.

Regarding wrapping the Fyne code in general tries to keep to around 120 Cols, though it’s not enforced.
Navigating long lines in markdown with a cli text editor is painful.

Agree with the above especially with the not enforced in special case (i.e. when improve readibility).
Usually is the IDE plugin that wraps it for me, even if probably these README and CHANGELOG contain some old code not wrapped correctly :-)

Jacalz

Building for arm64 does not seem to work. It complains about it not being supported:

~/go/bin/fyne-cross freebsd -arch amd64,arm64 -app-id com.github.jacalz.wormhole-gui -icon internal/assets/icon/icon-512.png
[✗] could not make build context for freebsd OS: arch "arm64" is not supported. Supported: [amd64]

EDIT: I added the arch to the support list and got this error instead:

~/go/bin/fyne-cross freebsd -arch amd64,arm64 -app-id com.github.jacalz.wormhole-gui -icon internal/assets/icon/icon-512.png
[i] Target: freebsd/amd64
[i] Cleaning target directories...
[✓] "bin" dir cleaned: /home/jacob/go/src/github.com/Jacalz/wormhole-gui/fyne-cross/bin/freebsd-amd64
[✓] "dist" dir cleaned: /home/jacob/go/src/github.com/Jacalz/wormhole-gui/fyne-cross/dist/freebsd-amd64
[✓] "temp" dir cleaned: /home/jacob/go/src/github.com/Jacalz/wormhole-gui/fyne-cross/tmp/freebsd-amd64
[i] Checking for go.mod: /home/jacob/go/src/github.com/Jacalz/wormhole-gui/go.mod
[✓] go.mod found
[i] Building binary...
# github.com/go-gl/glfw/v3.3/glfw
In file included from /go/pkg/mod/github.com/go-gl/glfw/v3.3/glfw@v0.0.0-20200625191551-73d3c3675aa3/native_linbsd.go:10:
In file included from /go/pkg/mod/github.com/go-gl/glfw/v3.3/glfw@v0.0.0-20200625191551-73d3c3675aa3/glfw/include/GLFW/glfw3native.h:114:
In file included from /freebsd/usr/local/include/GL/glx.h:32:
/freebsd/usr/local/include/GL/gl.h:56:11: warning: 'GLAPIENTRY' macro redefined [-Wmacro-redefined]
/go/pkg/mod/github.com/go-gl/glfw/v3.3/glfw@v0.0.0-20200625191551-73d3c3675aa3/glfw/include/GLFW/glfw3.h:5863:10: note: previous definition is here
[✓] Binary: /home/jacob/go/src/github.com/Jacalz/wormhole-gui/fyne-cross/bin/freebsd-amd64/wormhole-gui
[i] Packaging app...
[✓] Package: /home/jacob/go/src/github.com/Jacalz/wormhole-gui/fyne-cross/dist/freebsd-amd64/wormhole-gui.tar.gz
[i] Target: freebsd/arm64
[i] Cleaning target directories...
[✓] "dist" dir cleaned: /home/jacob/go/src/github.com/Jacalz/wormhole-gui/fyne-cross/dist/freebsd-arm64
[✓] "temp" dir cleaned: /home/jacob/go/src/github.com/Jacalz/wormhole-gui/fyne-cross/tmp/freebsd-arm64
[✓] "bin" dir cleaned: /home/jacob/go/src/github.com/Jacalz/wormhole-gui/fyne-cross/bin/freebsd-arm64
[i] Checking for go.mod: /home/jacob/go/src/github.com/Jacalz/wormhole-gui/go.mod
[✓] go.mod found
[i] Building binary...
docker: invalid reference format.
See 'docker run --help'.
[✗] exit status 125

lucor · 2021-03-28T18:14:26Z

mmm weird, the code should be there
@Jacalz could you please check if your local copy is up-to-date with this branch?

Jacalz · 2021-03-30T06:52:00Z

mmm weird, the code should be there
@Jacalz could you please check if your local copy is up-to-date with this branch?

Yeah, it very much sounds like I used an order version. Will see if I can test again later today.

dosgo · 2021-03-30T07:11:45Z

How to use this? go get?

lucor · 2021-03-30T08:53:12Z

How to use this? go get?

cd /tmp
git clone https://github.com/lucor/fyne-io-fyne-cross.git
cd fyne-io-fyne-cross
git checkout docker-images-refactoring
go build

Jacalz · 2021-03-30T17:55:18Z

How to use this? go get?

cd /tmp
git clone https://github.com/lucor/fyne-io-fyne-cross.git
cd fyne-io-fyne-cross
git checkout docker-images-refactoring
go build

You'd have to run make build-images as well, right?

Jacalz

Sorry for using the wrong version for testing earlier. This works fine. I can't test FreeBSD arm64 binaries unfortunately as my RPi 4 gets stuck in a boot-loop for some reason when I try to boot FreeBSD on it (RPi4 support is in FreeBSD 13.0 and later).

lucor · 2021-03-30T19:01:38Z

To test this PR it is not needed. The images should be already available on Docker Hub.

lucor · 2021-03-31T06:58:46Z

Sorry for using the wrong version for testing earlier. This works fine. I can't test FreeBSD arm64 binaries unfortunately as my RPi 4 gets stuck in a boot-loop for some reason when I try to boot FreeBSD on it (RPi4 support is in FreeBSD 13.0 and later).

No worries, thanks for testing. Going to merge in develop.

Relies on fyne-io/fyne-cross#37

lucor added 17 commits March 7, 2021 19:08

Add darwin arm64 target

f3557f5

This commit add support for the darwin arm64 target. Additionally provides: - Update Go to v1.16.0 - Update fyne cli to v2.0.1 - Add darwin arm64 target - Remove darwin 386 target Fixes fyne-io#33

Update multistage labels

b523710

Update appID check

2beff8c

Update darwin image to use the Command Line Tools for Xcode

e072d73

Add dedicated docker image for windows

1d0ae5d

Fix typo in CC flag for the darwin arm64 build

705254e

Fake sign darwin arm64 binaries using ldid

f9ae7eb

Revert "Fake sign darwin arm64 binaries using ldid"

a2003c3

This reverts commit f9ae7eb.

Update Go to v1.16.1

27c55af

Update Go to v1.16.2

c95deca

Fix macos min verstion target for darwin arm64

0d36b99

Add the darwin-image command

4707fa3

Update CHANGELOG

372df38

Makes CI test for goimports happy

3aab2ec

Fix clang missed in freebsd image

5e2241a

Fix darwin dockerfile was missing FYNE_CROSS_VERSION

460e8e3

Add the -no-docker option for darwin to build directly from the host

a5cc14e

When building from macOS the SDK could be already available on the host. This commit adds the `-no-docker` options to build directly from the host using the fyne CLI tool without using any docker image.

Jacalz requested changes Mar 20, 2021

View reviewed changes

lucor and others added 5 commits March 21, 2021 17:26

Update CHANGELOG.md

0d13345

Co-authored-by: Jacob <Jacalz@users.noreply.github.com>

Update README.md

a0b339e

Co-authored-by: Jacob <Jacalz@users.noreply.github.com>

Update README.md

c02662d

Update CHANGELOGs

e6a861e

Update CHANGELOG.md

63f9ab1

Co-authored-by: Jacob <Jacalz@users.noreply.github.com>

Rename the no-docker flag to local

7340a9e

Jacalz requested changes Mar 28, 2021

View reviewed changes

lucor mentioned this pull request Mar 30, 2021

Add golang 1.16 support? #38

Closed

Jacalz approved these changes Mar 30, 2021

View reviewed changes

lucor merged commit 578925f into fyne-io:develop Mar 31, 2021

lucor deleted the docker-images-refactoring branch March 31, 2021 06:59

This was referenced Mar 31, 2021

Add FreeBSD on arm64 target #29

Closed

Add darwin arm64 target #39

Merged

Jacalz added a commit to Jacalz/rymdport that referenced this pull request Apr 2, 2021

Initial makefile support for cross-compilation to FreeBSD arm64

76aed31

Relies on fyne-io/fyne-cross#37

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Docker images refactoring #37

Docker images refactoring #37

lucor commented Mar 18, 2021 •

edited

andydotxyz commented Mar 18, 2021

lucor commented Mar 19, 2021

Jacalz commented Mar 20, 2021

Jacalz left a comment

andydotxyz commented Mar 20, 2021

Jacalz commented Mar 20, 2021 •

edited

andydotxyz commented Mar 21, 2021

Jacalz commented Mar 21, 2021

lucor commented Mar 21, 2021

Jacalz left a comment •

edited

lucor commented Mar 28, 2021

Jacalz commented Mar 30, 2021

dosgo commented Mar 30, 2021

lucor commented Mar 30, 2021

Jacalz commented Mar 30, 2021

Jacalz left a comment

lucor commented Mar 30, 2021

lucor commented Mar 31, 2021

Docker images refactoring #37

Docker images refactoring #37

Conversation

lucor commented Mar 18, 2021 • edited

andydotxyz commented Mar 18, 2021

lucor commented Mar 19, 2021

Jacalz commented Mar 20, 2021

Jacalz left a comment

Choose a reason for hiding this comment

andydotxyz commented Mar 20, 2021

Jacalz commented Mar 20, 2021 • edited

andydotxyz commented Mar 21, 2021

Jacalz commented Mar 21, 2021

lucor commented Mar 21, 2021

Jacalz left a comment • edited

Choose a reason for hiding this comment

lucor commented Mar 28, 2021

Jacalz commented Mar 30, 2021

dosgo commented Mar 30, 2021

lucor commented Mar 30, 2021

Jacalz commented Mar 30, 2021

Jacalz left a comment

Choose a reason for hiding this comment

lucor commented Mar 30, 2021

lucor commented Mar 31, 2021

lucor commented Mar 18, 2021 •

edited

Jacalz commented Mar 20, 2021 •

edited

Jacalz left a comment •

edited