From 89a67ea520fe3c6c2862f65bdab00e7eb78ec235 Mon Sep 17 00:00:00 2001 From: samthebest699 <106000727+samthebest699@users.noreply.github.com> Date: Sat, 24 Aug 2024 09:30:00 -0500 Subject: [PATCH 1/8] Update DockerBuild.sh Ensure that the X11 server allows connections from the Docker container. --- DockerBuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DockerBuild.sh b/DockerBuild.sh index 18b7777bf8..4d8b7d6a86 100755 --- a/DockerBuild.sh +++ b/DockerBuild.sh @@ -2,7 +2,7 @@ PROJECT_ROOT=$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)") set -x - +xhost +local:docker # Wishlist hint: For developers, creating a Docker Compose # setup with persistent volumes for the build & deps directories # would speed up recompile times significantly. For end users, From 3de7567f4df32fef4ac3e92638689e2210333063 Mon Sep 17 00:00:00 2001 From: AnotherSamWithADream <106000727+AnotherSamWithADream@users.noreply.github.com> Date: Sat, 24 Aug 2024 09:37:19 -0500 Subject: [PATCH 2/8] Update DockerBuild.sh Removed fix for X11. Will add to DockerRun.sh --- DockerBuild.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/DockerBuild.sh b/DockerBuild.sh index 4d8b7d6a86..99c499b526 100755 --- a/DockerBuild.sh +++ b/DockerBuild.sh @@ -2,7 +2,6 @@ PROJECT_ROOT=$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)") set -x -xhost +local:docker # Wishlist hint: For developers, creating a Docker Compose # setup with persistent volumes for the build & deps directories # would speed up recompile times significantly. For end users, From 2dc9062abb696c8246884fd9278091c6c02febf3 Mon Sep 17 00:00:00 2001 From: AnotherSamWithADream <106000727+AnotherSamWithADream@users.noreply.github.com> Date: Sat, 24 Aug 2024 09:40:46 -0500 Subject: [PATCH 3/8] Update DockerRun.sh Added help comment to fix and ensure that your X11 server allows connections from the Docker container. --- DockerRun.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DockerRun.sh b/DockerRun.sh index c06628e6be..c05022b1b8 100755 --- a/DockerRun.sh +++ b/DockerRun.sh @@ -5,6 +5,8 @@ set -x # -h $HOSTNAME \ # If there's problems with the X display, try this # -v /tmp/.X11-unix:/tmp/.X11-unix \ +# If you get an error like "Authorization required, but no authorization protocol specified," run line 9 in your terminal before rerunning this program +# xhost +local:docker docker run \ `# Use the hosts networking. Printer wifi and also dbus communication` \ --net=host \ From 9b8924858718d8311005c7243a860d96873b1486 Mon Sep 17 00:00:00 2001 From: AnotherSamWithADream <106000727+AnotherSamWithADream@users.noreply.github.com> Date: Sat, 24 Aug 2024 10:17:41 -0500 Subject: [PATCH 4/8] linxu build with docker in readme Add build on linux with docker section --- README.md | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index da42312e32..1c01a3f08b 100644 --- a/README.md +++ b/README.md @@ -92,12 +92,19 @@ Explore the latest developments in Orca Slicer with our nightly builds. Feedback - Run => Info tab => Build Configuration: `RelWithDebInfo` - Run => Options tab => Document Versions: uncheck `Allow debugging when browsing versions` - menu bar: Product => Run - -- Ubuntu - - Dependencies **Will be auto installed with the shell script**: `libmspack-dev libgstreamerd-3-dev libsecret-1-dev libwebkit2gtk-4.0-dev libosmesa6-dev libssl-dev libcurl4-openssl-dev eglexternalplatform-dev libudev-dev libdbus-1-dev extra-cmake-modules libgtk2.0-dev libglew-dev libudev-dev libdbus-1-dev cmake git texinfo` - - run 'sudo ./BuildLinux.sh -u' - - run './BuildLinux.sh -dsir' - +- Linux + - Docker + - Dependencies: Docker [Installation Instructions](https://www.docker.com/get-started/), git + - clone this repository `git clone https://github.com/SoftFever/OrcaSlicer` + - run `./DockerBuild.sh` + - If you get low RAM error, run `./DockerBuildLowRam.sh` + - To run OrcaSlicer: + - run `./DockerRun.sh` + - For most common errors, open `DockerRun.sh` and read the comments. + - Ubuntu + - Dependencies **Will be auto installed with the shell script**: `libmspack-dev libgstreamerd-3-dev libsecret-1-dev libwebkit2gtk-4.0-dev libosmesa6-dev libssl-dev libcurl4-openssl-dev eglexternalplatform-dev libudev-dev libdbus-1-dev extra-cmake-modules libgtk2.0-dev libglew-dev libudev-dev libdbus-1-dev cmake git texinfo` + - run 'sudo ./BuildLinux.sh -u' + - run './BuildLinux.sh -dsir' # Note: If you're running Klipper, it's recommended to add the following configuration to your `printer.cfg` file. From 48b50f7e099d466af7ae3e9be6df7aa5be9da833 Mon Sep 17 00:00:00 2001 From: AnotherSamWithADream <106000727+AnotherSamWithADream@users.noreply.github.com> Date: Sat, 24 Aug 2024 10:18:26 -0500 Subject: [PATCH 5/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1c01a3f08b..82848d05e9 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,7 @@ Explore the latest developments in Orca Slicer with our nightly builds. Feedback - Run => Info tab => Build Configuration: `RelWithDebInfo` - Run => Options tab => Document Versions: uncheck `Allow debugging when browsing versions` - menu bar: Product => Run -- Linux +- Linux (All Distros) - Docker - Dependencies: Docker [Installation Instructions](https://www.docker.com/get-started/), git - clone this repository `git clone https://github.com/SoftFever/OrcaSlicer` From 908001e16e3d746b9ffa36803a1f8b2ba591baa0 Mon Sep 17 00:00:00 2001 From: AnotherSamWithADream <106000727+AnotherSamWithADream@users.noreply.github.com> Date: Sat, 24 Aug 2024 10:19:35 -0500 Subject: [PATCH 6/8] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 82848d05e9..6320190640 100644 --- a/README.md +++ b/README.md @@ -96,6 +96,7 @@ Explore the latest developments in Orca Slicer with our nightly builds. Feedback - Docker - Dependencies: Docker [Installation Instructions](https://www.docker.com/get-started/), git - clone this repository `git clone https://github.com/SoftFever/OrcaSlicer` + - run `cd OrcaSlicer` - run `./DockerBuild.sh` - If you get low RAM error, run `./DockerBuildLowRam.sh` - To run OrcaSlicer: From 9440b4cbfaaadf9583546276b3a4d07c7ca2f668 Mon Sep 17 00:00:00 2001 From: AnotherSamWithADream <106000727+AnotherSamWithADream@users.noreply.github.com> Date: Sat, 24 Aug 2024 10:21:13 -0500 Subject: [PATCH 7/8] Update README.md remove low ram thing --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 6320190640..5aa6209b1e 100644 --- a/README.md +++ b/README.md @@ -98,7 +98,6 @@ Explore the latest developments in Orca Slicer with our nightly builds. Feedback - clone this repository `git clone https://github.com/SoftFever/OrcaSlicer` - run `cd OrcaSlicer` - run `./DockerBuild.sh` - - If you get low RAM error, run `./DockerBuildLowRam.sh` - To run OrcaSlicer: - run `./DockerRun.sh` - For most common errors, open `DockerRun.sh` and read the comments. From 4201b8c92af53bee6595c428184a54d438106a3e Mon Sep 17 00:00:00 2001 From: AnotherSamWithADream <106000727+AnotherSamWithADream@users.noreply.github.com> Date: Sat, 24 Aug 2024 10:22:10 -0500 Subject: [PATCH 8/8] Update Dockerfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 868779b0af..3e8a33f3fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -68,14 +68,14 @@ WORKDIR OrcaSlicer RUN ./BuildLinux.sh -u # Build dependencies in ./deps -RUN ./BuildLinux.sh -d +RUN ./BuildLinux.sh -dr # Build slic3r -RUN ./BuildLinux.sh -s +RUN ./BuildLinux.sh -sr # Build AppImage ENV container podman -RUN ./BuildLinux.sh -i +RUN ./BuildLinux.sh -ir # It's easier to run Orca Slicer as the same username, # UID and GID as your workstation. Since we bind mount