code.ivysaur.me/miqt
1
0
Fork 0
mirror of https://github.com/mappu/miqt.git synced 2025-05-07 12:30:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

miqt-docker: update README, simplify usage output

Browse Source
This commit is contained in:
mappu 2025-05-01 21:19:51 +12:00
parent f0ce7984ce
commit a82e43585d
2 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
cmd/miqt-docker/README.md
View File

@ -1,17 +1,10 @@
# miqt-docker # miqt-docker
This is a helper program to quickly run a dockerized MIQT build environment. This is an optional helper program to quickly run a dockerized MIQT cross-compiler
environment. Many containers are available targeting different OSes and Qt versions.
It also has some built-in commands that can be run either dockerized or natively. It also has some built-in commands that can be run either dockerized or natively.
- Supports all available MIQT docker containers
- Use glob matches to automatically pick the highest version container for target
- Automatically build new docker containers or reuse existing, based on content hash of the Dockerfile
- Automatically bind source code volume from current go.mod / go.work / git repository and preserve relative working directory
- Handles bind-mounting the GOCACHE and GOMODCACHE directories
- Handles using the proper uid+gid on Linux
- Automatically detect sudo requirement on Linux
## Usage ## Usage
Run `miqt-docker` with no arguments to see full usage instructions and all Run `miqt-docker` with no arguments to see full usage instructions and all
@ -21,7 +14,7 @@ available embedded dockerfiles:
Usage: miqt-docker ENVIRONMENT COMMAND... Usage: miqt-docker ENVIRONMENT COMMAND...
COMMAND may be any shell command (e.g. go build); or /bin/bash to get an COMMAND may be any shell command (e.g. go build); or /bin/bash to get an
interactive terminal; or one of the following special tasks: interactive terminal; or one of the following predefined tasks:
-build Run 'go build' with usual MIQT flags -build Run 'go build' with usual MIQT flags
-minify-build Run 'go build' with special minification flags -minify-build Run 'go build' with special minification flags
@ -36,10 +29,35 @@ Available container environments: (use - as wildcard character)
[...] [...]
``` ```
You can specify the environment using a short form of the name. For example,
`win64-static` will be expanded to the regex `/win64.+static/` and pick the
best available match with the highest version number (`win64-cross-go1.24-qt6.8-static`
at time of writing).
This allows you to pin platforms and major versions in build commands while
automatically upgrading to minor versions.
Example build commands: Example build commands:
```bash ```bash
miqt-docker macos go build -ldflags '-s -w' miqt-docker macos go build -ldflags '-s -w'
miqt-docker win64-qt6-dynamic go build -ldflags '-s -w -H windowsgui' miqt-docker native -minify-build
miqt-docker win64-qt6-static -windows-build
miqt-docker win64-qt6-static /bin/bash
miqt-docker android-qt6 -android-build miqt-docker android-qt6 -android-build
``` ```
## Comparison to manual Docker commands
You can create a dockerized MIQT build environment yourself using the Dockerfiles
in the `docker/` directory. The benefit of miqt-docker is:
- Embeds all available MIQT docker containers
- Use glob matches to automatically pick the highest version container for target
- Automatically build new docker containers or reuse existing, based on content hash of the Dockerfile
- Consistently named docker images across multiple projects using MIQT
- Automatically bind source code volume from current go.mod / go.work / git repository and preserve relative working directory
- Handles bind-mounting the GOCACHE and GOMODCACHE directories for fast rebuilds
- Handles using the proper uid+gid on Linux
- Automatically detect sudo requirement on Linux
- Convenient predefined tasks
- Advanced build support for Android

4
cmd/miqt-docker/main.go
View File

@ -53,11 +53,11 @@ Environment variables:
DOCKER Override the path to docker DOCKER Override the path to docker
Available container environments: (use - as wildcard character) Available container environments: (use - as wildcard character)
- native (Run natively without docker) native (Run natively without docker)
`) `)
for _, ff := range dockerfiles { for _, ff := range dockerfiles {
fmt.Fprintf(os.Stderr, "- %s\n", strings.TrimSuffix(ff.Name(), `.Dockerfile`)) fmt.Fprintf(os.Stderr, " %s\n", strings.TrimSuffix(ff.Name(), `.Dockerfile`))
} }
os.Exit(1) os.Exit(1)