almost works

This commit is contained in:
2023-04-20 11:33:19 +03:00
parent 9c68e310f6
commit 8d93ea3424

View File

@@ -6,10 +6,10 @@
"docker_dir": "linux_desktop", "docker_dir": "linux_desktop",
"docker_image": "debian", "docker_image": "debian",
"docker_build_options": { "docker_build_options": {
"image_from": "debian:buster-slim", "image_from": "debian:buster-slim",
"image_prepare_script": "install_apt.sh" "image_prepare_script": "install_apt.sh"
}, },
"ppa_filters": ["raspbian10"] "ppa_filters": ["debian10", "raspbian10"]
}, },
"Debian 11": { "Debian 11": {
"enabled": true, "enabled": true,
@@ -17,10 +17,11 @@
"docker_dir": "linux_desktop", "docker_dir": "linux_desktop",
"docker_image": "debian11", "docker_image": "debian11",
"docker_build_options": { "docker_build_options": {
"image_from": "debian:bullseye-slim", "image_from": "debian:bullseye-slim",
"image_prepare_script": "install_apt.sh", "image_prepare_script": "install_apt.sh",
"QT_FROM_SOURCE": false "QT_FROM_SOURCE": false
} },
"ppa_filters": ["debian11"]
}, },
"Debian 12": { "Debian 12": {
"enabled": false, "enabled": false,
@@ -28,10 +29,11 @@
"docker_dir": "linux_desktop", "docker_dir": "linux_desktop",
"docker_image": "debian12", "docker_image": "debian12",
"docker_build_options": { "docker_build_options": {
"image_from": "debian:bookworm-slim", "image_from": "debian:bookworm-slim",
"image_prepare_script": "install_apt.sh", "image_prepare_script": "install_apt.sh",
"QT_FROM_SOURCE": false "QT_FROM_SOURCE": false
} },
"ppa_filters": ["debian12"]
}, },
"Debian 13": { "Debian 13": {
"enabled": false, "enabled": false,
@@ -39,10 +41,11 @@
"docker_dir": "linux_desktop", "docker_dir": "linux_desktop",
"docker_image": "debian13", "docker_image": "debian13",
"docker_build_options": { "docker_build_options": {
"image_from": "debian:trixie-slim", "image_from": "debian:trixie-slim",
"image_prepare_script": "install_apt.sh", "image_prepare_script": "install_apt.sh",
"QT_FROM_SOURCE": false "QT_FROM_SOURCE": false
} },
"ppa_filters": ["debian13"]
}, },
"Ubuntu 20.04": { "Ubuntu 20.04": {
"enabled": true, "enabled": true,
@@ -51,9 +54,10 @@
"docker_image": "ubuntu", "docker_image": "ubuntu",
"docker_from": "ubuntu:20.04", "docker_from": "ubuntu:20.04",
"docker_build_options": { "docker_build_options": {
"image_from": "ubuntu:20.04", "image_from": "ubuntu:20.04",
"image_prepare_script": "install_apt.sh", "image_prepare_script": "install_apt.sh"
} },
"ppa_filters": ["ubuntu20.04"]
}, },
"Ubuntu 22.04": { "Ubuntu 22.04": {
"enabled": true, "enabled": true,
@@ -61,10 +65,11 @@
"docker_dir": "linux_desktop", "docker_dir": "linux_desktop",
"docker_image": "ubuntu22.04", "docker_image": "ubuntu22.04",
"docker_build_options": { "docker_build_options": {
"image_from": "ubuntu:22.04", "image_from": "ubuntu:22.04",
"image_prepare_script": "install_apt.sh", "image_prepare_script": "install_apt.sh",
"QT_FROM_SOURCE": false "QT_FROM_SOURCE": false
} },
"ppa_filters": ["ubuntu22.04"]
}, },
"Ubuntu 24.04": { "Ubuntu 24.04": {
"enabled": false, "enabled": false,
@@ -72,10 +77,11 @@
"docker_dir": "linux_desktop", "docker_dir": "linux_desktop",
"docker_image": "ubuntu24.04", "docker_image": "ubuntu24.04",
"docker_build_options": { "docker_build_options": {
"image_from": "ubuntu:24.04", "image_from": "ubuntu:24.04",
"image_prepare_script": "install_apt.sh", "image_prepare_script": "install_apt.sh",
"QT_FROM_SOURCE": false "QT_FROM_SOURCE": false
} },
"ppa_filters": ["ubuntu24.04"]
}, },
"Ubuntu 22.10": { "Ubuntu 22.10": {
"enabled": true, "enabled": true,
@@ -84,10 +90,11 @@
"docker_dir": "linux_desktop", "docker_dir": "linux_desktop",
"docker_image": "ubuntu22.10", "docker_image": "ubuntu22.10",
"docker_build_options": { "docker_build_options": {
"image_from": "ubuntu:22.10", "image_from": "ubuntu:22.10",
"image_prepare_script": "install_apt.sh", "image_prepare_script": "install_apt.sh",
"QT_FROM_SOURCE": false "QT_FROM_SOURCE": false
} },
"ppa_filters": ["ubuntu22.10"]
}, },
"Windows x64": { "Windows x64": {
"enabled": true, "enabled": true,
@@ -107,7 +114,7 @@
"docker_image": "osx", "docker_image": "osx",
"docker_build_options": {} "docker_build_options": {}
}, },
"Raspbian": { "Raspbian 10": {
"enabled": true, "enabled": true,
"docker_dir": "pi", "docker_dir": "pi",
"docker_image": "pi", "docker_image": "pi",
@@ -118,7 +125,7 @@
"docker_dir": "android", "docker_dir": "android",
"docker_image": "android", "docker_image": "android",
"docker_build_options": { "docker_build_options": {
"QT_DOWNLOAD_SERVER": "172.17.0.1" "QT_DOWNLOAD_SERVER": "172.17.0.1"
} }
} }
} }