From f621e6b9c1aaf4b73e28e375ac2376eecb2eee9f Mon Sep 17 00:00:00 2001 From: Jakob Lechner Date: Thu, 13 Jul 2023 02:07:50 +0000 Subject: [PATCH 01/12] debug --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 93829cb..fd45073 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,6 +22,7 @@ dockerimage_builder: services: - docker:dind script: + - set -x - docker pull $DOCKER_IMAGE_BUILDER || true - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY - make builderimg @@ -40,6 +41,7 @@ dockerimage_security_scanner: services: - docker:dind script: + - set -x - docker pull $DOCKER_IMAGE_SECURITY_SCANNER || true - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY - make secscanimg From 76da536bbdaa93a85eeda086ad13c402d5b15ee7 Mon Sep 17 00:00:00 2001 From: Jakob Lechner Date: Thu, 13 Jul 2023 02:10:45 +0000 Subject: [PATCH 02/12] Rename CI token variable --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 93829cb..a173edc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,7 @@ dockerimage_builder: - docker:dind script: - docker pull $DOCKER_IMAGE_BUILDER || true - - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - make builderimg - docker push $DOCKER_IMAGE_BUILDER tags: @@ -41,7 +41,7 @@ dockerimage_security_scanner: - docker:dind script: - docker pull $DOCKER_IMAGE_SECURITY_SCANNER || true - - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - make secscanimg - docker push $DOCKER_IMAGE_SECURITY_SCANNER tags: From 1e0e997f17cf73e8e6b1c9f0d9e73f7dddef8720 Mon Sep 17 00:00:00 2001 From: Jakob Lechner Date: Thu, 13 Jul 2023 10:22:20 +0000 Subject: [PATCH 03/12] Update tags The `dedicated` runner was removed --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a173edc..c430cd6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,6 @@ dockerimage_builder: - docker push $DOCKER_IMAGE_BUILDER tags: - fablab - - ssd except: refs: - schedules @@ -46,7 +45,6 @@ dockerimage_security_scanner: - docker push $DOCKER_IMAGE_SECURITY_SCANNER tags: - fablab - - ssd except: refs: - schedules @@ -66,7 +64,7 @@ security_scanner: - $task == "security-scanner" - $target tags: - - dedicated + - fablab .squashfs_template: &squashfs_template image: $DOCKER_IMAGE_BUILDER From 27ec180b7940d07ae6df334db370e100b56e3d2d Mon Sep 17 00:00:00 2001 From: Jakob Lechner Date: Thu, 7 Sep 2023 19:31:11 +0000 Subject: [PATCH 04/12] Use lightburn without docker --- .gitlab-ci.yml | 11 ++++ packer/ansible/playbook.yml | 4 ++ .../fablab/files/lightburn/lightburn.desktop | 9 --- .../roles/fablab/files/lightburn/lightburn.sh | 34 ---------- .../ansible/roles/fablab/tasks/lightburn.yml | 66 ------------------- packer/ansible/roles/fablab/tasks/main.yml | 3 - .../fablab/templates/lightburn/lightburn.j2 | 1 - packer/ansible/roles/lightburn/.gitignore | 1 + .../roles/lightburn/files/lightburn.desktop | 6 ++ .../ansible/roles/lightburn/tasks/devices.yml | 34 ++++++++++ .../ansible/roles/lightburn/tasks/install.yml | 13 ++++ packer/ansible/roles/lightburn/tasks/main.yml | 10 +++ 12 files changed, 79 insertions(+), 113 deletions(-) delete mode 100644 packer/ansible/roles/fablab/files/lightburn/lightburn.desktop delete mode 100755 packer/ansible/roles/fablab/files/lightburn/lightburn.sh delete mode 100644 packer/ansible/roles/fablab/tasks/lightburn.yml delete mode 100755 packer/ansible/roles/fablab/templates/lightburn/lightburn.j2 create mode 100644 packer/ansible/roles/lightburn/.gitignore create mode 100644 packer/ansible/roles/lightburn/files/lightburn.desktop create mode 100644 packer/ansible/roles/lightburn/tasks/devices.yml create mode 100644 packer/ansible/roles/lightburn/tasks/install.yml create mode 100644 packer/ansible/roles/lightburn/tasks/main.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c430cd6..77525ea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -66,6 +66,17 @@ security_scanner: tags: - fablab +lightburn-download: + stage: prepare + image: alpine + script: + - mkdir -p packer/ansible/roles/lightburn/files + - 'wget -O packer/ansible/roles/lightburn/files/lightburn.zip --header "JOB-TOKEN: $CI_JOB_TOKEN" "${CI_SERVER_URL}/api/v4/projects/fablab%2Flightburn-patched/jobs/artifacts/main/download?job=patch-Linux64"' + artifacts: + paths: + - packer/ansible/roles/lightburn/files/lightburn.zip + expire_in: 4 hours + .squashfs_template: &squashfs_template image: $DOCKER_IMAGE_BUILDER stage: build diff --git a/packer/ansible/playbook.yml b/packer/ansible/playbook.yml index 8fb1adf..22db53b 100644 --- a/packer/ansible/playbook.yml +++ b/packer/ansible/playbook.yml @@ -11,6 +11,7 @@ - role: firefox - role: windowmanager - role: inkscape + - role: lightburn - role: fablab - role: hardware - role: docker @@ -109,3 +110,6 @@ Du hast Dich mit einem Gast-Account angemeldet. Alle Daten werden nach der Anmeldung gelöscht. Wenn Du Deine Daten dauerhaft speichern möchtest, lege Dir bitte einen Account an! + lightburn: + devices: + - https://raw.githubusercontent.com/fablab-nea/LaserKutter/main/lightburn/LaserKutter.lbdev diff --git a/packer/ansible/roles/fablab/files/lightburn/lightburn.desktop b/packer/ansible/roles/fablab/files/lightburn/lightburn.desktop deleted file mode 100644 index 90496bc..0000000 --- a/packer/ansible/roles/fablab/files/lightburn/lightburn.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=LightBurn -GenericName=LightBurn -Comment=Laser Cutter Job Control Application -Exec=x-terminal-emulator -e 'sudo /usr/local/bin/lightburn' -Icon=/usr/local/share/lightburn/lightburn.png -Terminal=false -Type=Application -Categories=Graphics diff --git a/packer/ansible/roles/fablab/files/lightburn/lightburn.sh b/packer/ansible/roles/fablab/files/lightburn/lightburn.sh deleted file mode 100755 index 5e84a58..0000000 --- a/packer/ansible/roles/fablab/files/lightburn/lightburn.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env bash - -. /etc/default/lightburn - -if [ ! -z "$SUDO_COMMAND" ] && [ "$SUDO_COMMAND" = "$0" ]; then - home="$(getent passwd "$SUDO_UID" | cut -d: -f6)" - export PUID="$SUDO_UID" - export PGID="$SUDO_GID" -else - home="$HOME" - export PUID=$(id -u) - export PGID=$(id -g) -fi - -config_dir="$home/.config/lightburn" - -mkdir -p "$config_dir" - -media="/media/$(id -un $PUID)" -if [ -e "$media" ]; then - media_volume="-v $media:/media" -fi - -docker run \ - --rm \ - -e PUID \ - -e PGID \ - -e DISPLAY \ - -v /tmp/.X11-unix/:/tmp/.X11-unix/ \ - -v $config_dir:/config/ \ - -v $home:/workdir/ \ - $media_volume \ - --network=none \ - "$LIGHTBURN_DOCKER_IMAGE" diff --git a/packer/ansible/roles/fablab/tasks/lightburn.yml b/packer/ansible/roles/fablab/tasks/lightburn.yml deleted file mode 100644 index 19f9386..0000000 --- a/packer/ansible/roles/fablab/tasks/lightburn.yml +++ /dev/null @@ -1,66 +0,0 @@ ---- -- file: - path: /usr/local/share/lightburn - state: directory - mode: "0755" - owner: root - group: root - -- name: copy icon - copy: - src: lightburn/lightburn.png - dest: /usr/local/share/lightburn/lightburn.png - owner: root - group: root - mode: "0644" - -- name: copy script - copy: - src: lightburn/lightburn.sh - dest: /usr/local/bin/lightburn - owner: root - group: root - mode: "0755" - -- name: add lightburn configuration - template: - src: lightburn/lightburn.j2 - dest: /etc/default/lightburn - owner: root - group: root - mode: "0644" - -- name: add lightburn to applications menu - copy: - src: lightburn/lightburn.desktop - dest: /usr/share/applications/lightburn.desktop - owner: root - group: root - mode: "0644" - -- name: add group - group: - name: lightburn - system: yes - -- name: add sudoers config - copy: - content: "%lightburn ALL=/usr/local/bin/lightburn, NOPASSWD:/usr/local/bin/lightburn\n" - dest: /etc/sudoers.d/lightburn - owner: root - group: root - mode: "0644" - -- name: ensure guest-account settings directory exists - file: - path: /etc/guest-account - state: directory - mode: "0755" - owner: root - group: root - -- name: add lightburn group to guest account - lineinfile: - path: /etc/guest-account/groups - line: lightburn - create: yes diff --git a/packer/ansible/roles/fablab/tasks/main.yml b/packer/ansible/roles/fablab/tasks/main.yml index 40c6d9a..02faee9 100644 --- a/packer/ansible/roles/fablab/tasks/main.yml +++ b/packer/ansible/roles/fablab/tasks/main.yml @@ -18,9 +18,6 @@ - import_tasks: visicut.yml tags: - fablab:visicut - - import_tasks: lightburn.yml - tags: - - fablab:lightburn - import_tasks: prusa.yml tags: - fablab:prusa diff --git a/packer/ansible/roles/fablab/templates/lightburn/lightburn.j2 b/packer/ansible/roles/fablab/templates/lightburn/lightburn.j2 deleted file mode 100755 index bf7cfad..0000000 --- a/packer/ansible/roles/fablab/templates/lightburn/lightburn.j2 +++ /dev/null @@ -1 +0,0 @@ -LIGHTBURN_DOCKER_IMAGE='{{ fablab.lightburn.dockerimage }}' diff --git a/packer/ansible/roles/lightburn/.gitignore b/packer/ansible/roles/lightburn/.gitignore new file mode 100644 index 0000000..c4c4ffc --- /dev/null +++ b/packer/ansible/roles/lightburn/.gitignore @@ -0,0 +1 @@ +*.zip diff --git a/packer/ansible/roles/lightburn/files/lightburn.desktop b/packer/ansible/roles/lightburn/files/lightburn.desktop new file mode 100644 index 0000000..62d3c05 --- /dev/null +++ b/packer/ansible/roles/lightburn/files/lightburn.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=LightBurn +Exec=/opt/LightBurn/LightBurn +Icon=/opt/LightBurn/LightBurn.png +Type=Application +Categories=Graphics;VectorGraphics;Engineering; diff --git a/packer/ansible/roles/lightburn/tasks/devices.yml b/packer/ansible/roles/lightburn/tasks/devices.yml new file mode 100644 index 0000000..2981a65 --- /dev/null +++ b/packer/ansible/roles/lightburn/tasks/devices.yml @@ -0,0 +1,34 @@ +- name: Download devices files + uri: + url: "{{ device_url }}" + return_content: true + loop: "{{ lightburn.devices }}" + loop_control: + loop_var: device_url + register: lightburn_downloaded_devices + +- name: Create lightburn settings + set_fact: + lightburn_devices: "{{ lightburn_devices | default([]) + [device_settings] }}" + vars: + device_settings: "{{ (device.content | from_json)['DeviceList'][0] }}" + loop: "{{ lightburn_downloaded_devices.results }}" + loop_control: + loop_var: device + label: "{{ device_settings.DisplayName }}" + +- name: Create settings directory + file: + path: "{{ item }}" + state: directory + loop: + - /etc/skel/.config + - /etc/skel/.config/LightBurn + +- name: Create settings file + copy: + dest: /etc/skel/.config/LightBurn/prefs.ini + content: "{{ lightburn_settings | to_nice_json() }}" + vars: + lightburn_settings: + DeviceList: "{{ lightburn_devices }}" diff --git a/packer/ansible/roles/lightburn/tasks/install.yml b/packer/ansible/roles/lightburn/tasks/install.yml new file mode 100644 index 0000000..cd9895d --- /dev/null +++ b/packer/ansible/roles/lightburn/tasks/install.yml @@ -0,0 +1,13 @@ +--- +- name: Extract zip file + unarchive: + src: lightburn.zip + dest: /opt +- name: Create applications directory + file: + path: /usr/local/share/applications/ + state: directory +- name: Copy desktop file + copy: + src: lightburn.desktop + dest: /usr/local/share/applications/lightburn.desktop diff --git a/packer/ansible/roles/lightburn/tasks/main.yml b/packer/ansible/roles/lightburn/tasks/main.yml new file mode 100644 index 0000000..82ab78c --- /dev/null +++ b/packer/ansible/roles/lightburn/tasks/main.yml @@ -0,0 +1,10 @@ +--- +- block: + - import_tasks: install.yml + tags: + - lightburn:install + - import_tasks: devices.yml + tags: + - lightburn:devices + tags: + - lightburn From dbb05df99fcdf5e143188fbda7faa85bb38cd2b9 Mon Sep 17 00:00:00 2001 From: Jakob Lechner Date: Thu, 7 Sep 2023 22:36:48 +0000 Subject: [PATCH 05/12] Remove tags --- .gitlab-ci.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 77525ea..670a6ad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,8 +26,6 @@ dockerimage_builder: - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - make builderimg - docker push $DOCKER_IMAGE_BUILDER - tags: - - fablab except: refs: - schedules @@ -43,8 +41,6 @@ dockerimage_security_scanner: - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - make secscanimg - docker push $DOCKER_IMAGE_SECURITY_SCANNER - tags: - - fablab except: refs: - schedules @@ -63,8 +59,6 @@ security_scanner: variables: - $task == "security-scanner" - $target - tags: - - fablab lightburn-download: stage: prepare @@ -93,9 +87,6 @@ lightburn-download: - images/*.linux #- images/*.squashfs - images/*.torrent - tags: - - fablab - - ssd squashfs_featurebranch: <<: *squashfs_template From d372cd9f098a79f7fefff1e5c8d74fa3341f5bc0 Mon Sep 17 00:00:00 2001 From: Jakob Lechner Date: Thu, 14 Sep 2023 20:19:04 +0000 Subject: [PATCH 06/12] Move prusa-slicer to own role --- packer/ansible/playbook.yml | 91 ++++++++++--------- packer/ansible/roles/fablab/tasks/main.yml | 3 - .../tasks/configure.yml} | 7 +- .../roles/prusa-slicer/tasks/install.yml | 5 + .../ansible/roles/prusa-slicer/tasks/main.yml | 12 +++ 5 files changed, 64 insertions(+), 54 deletions(-) rename packer/ansible/roles/{fablab/tasks/prusa.yml => prusa-slicer/tasks/configure.yml} (78%) create mode 100644 packer/ansible/roles/prusa-slicer/tasks/install.yml create mode 100644 packer/ansible/roles/prusa-slicer/tasks/main.yml diff --git a/packer/ansible/playbook.yml b/packer/ansible/playbook.yml index 22db53b..b994b60 100644 --- a/packer/ansible/playbook.yml +++ b/packer/ansible/playbook.yml @@ -12,6 +12,7 @@ - role: windowmanager - role: inkscape - role: lightburn + - role: prusa-slicer - role: fablab - role: hardware - role: docker @@ -45,51 +46,6 @@ version: 3.3.1 lightburn: dockerimage: r.jalr.de/fablab/lightburn - prusa_slicer: - settings: | - no_controller = 1 - no_defaults = 1 - preset_update = 0 - show_splash_screen = 0 - use_inches = 0 - version_check = 0 - view_mode = expert - - [filaments] - AmazonBasics TPU @MINI = 1 - Das Filament PLA = 1 - Generic PETG = 1 - Generic PETG @MINI = 1 - Generic PETG @MMU2 = 1 - Generic PLA = 1 - Generic PLA @MMU2 = 1 - Prusament ASA = 1 - Prusament ASA @MINI = 1 - Prusament ASA @MMU2 = 1 - Prusament PC Blend = 1 - Prusament PC Blend @MINI = 1 - Prusament PC Blend @MMU2 = 1 - Prusament PETG = 1 - Prusament PETG @MINI = 1 - Prusament PETG @MMU2 = 1 - Prusament PLA = 1 - Prusament PLA @MMU2 = 1 - Prusament PVB = 1 - Prusament PVB @MMU2 = 1 - Verbatim BVOH = 1 - Verbatim BVOH @MMU2 = 1 - - [presets] - filament = Prusament PLA - physical_printer = - print = 0.15mm QUALITY @MK3 - printer = Original Prusa i3 MK3 - sla_material = - sla_print = - - [vendor:PrusaResearch] - model:MK3 = 0.4 - model:MK3SMMU2S = 0.4 firefox: language_packs: - de @@ -113,3 +69,48 @@ lightburn: devices: - https://raw.githubusercontent.com/fablab-nea/LaserKutter/main/lightburn/LaserKutter.lbdev + prusa_slicer: + settings: | + no_controller = 1 + no_defaults = 1 + preset_update = 0 + show_splash_screen = 0 + use_inches = 0 + version_check = 0 + view_mode = expert + + [filaments] + AmazonBasics TPU @MINI = 1 + Das Filament PLA = 1 + Generic PETG = 1 + Generic PETG @MINI = 1 + Generic PETG @MMU2 = 1 + Generic PLA = 1 + Generic PLA @MMU2 = 1 + Prusament ASA = 1 + Prusament ASA @MINI = 1 + Prusament ASA @MMU2 = 1 + Prusament PC Blend = 1 + Prusament PC Blend @MINI = 1 + Prusament PC Blend @MMU2 = 1 + Prusament PETG = 1 + Prusament PETG @MINI = 1 + Prusament PETG @MMU2 = 1 + Prusament PLA = 1 + Prusament PLA @MMU2 = 1 + Prusament PVB = 1 + Prusament PVB @MMU2 = 1 + Verbatim BVOH = 1 + Verbatim BVOH @MMU2 = 1 + + [presets] + filament = Prusament PLA + physical_printer = + print = 0.15mm QUALITY @MK3 + printer = Original Prusa i3 MK3 + sla_material = + sla_print = + + [vendor:PrusaResearch] + model:MK3 = 0.4 + model:MK3SMMU2S = 0.4 diff --git a/packer/ansible/roles/fablab/tasks/main.yml b/packer/ansible/roles/fablab/tasks/main.yml index 02faee9..1bb8ab5 100644 --- a/packer/ansible/roles/fablab/tasks/main.yml +++ b/packer/ansible/roles/fablab/tasks/main.yml @@ -18,9 +18,6 @@ - import_tasks: visicut.yml tags: - fablab:visicut - - import_tasks: prusa.yml - tags: - - fablab:prusa # - import_tasks: platformio.yml # tags: # - fablab:platformio diff --git a/packer/ansible/roles/fablab/tasks/prusa.yml b/packer/ansible/roles/prusa-slicer/tasks/configure.yml similarity index 78% rename from packer/ansible/roles/fablab/tasks/prusa.yml rename to packer/ansible/roles/prusa-slicer/tasks/configure.yml index 8211e1c..817ae54 100644 --- a/packer/ansible/roles/fablab/tasks/prusa.yml +++ b/packer/ansible/roles/prusa-slicer/tasks/configure.yml @@ -1,9 +1,4 @@ --- -- name: install slic3r-prusa - apt: - name: slic3r-prusa - state: present - - name: create skel directories file: path: "/etc/skel/{{ item }}" @@ -21,5 +16,5 @@ - name: Copy Prusa slicer settings copy: - content: "{{ fablab.prusa_slicer.settings }}" + content: "{{ prusa_slicer.settings }}" dest: /etc/skel/.config/PrusaSlicer/PrusaSlicer.ini diff --git a/packer/ansible/roles/prusa-slicer/tasks/install.yml b/packer/ansible/roles/prusa-slicer/tasks/install.yml new file mode 100644 index 0000000..31a992c --- /dev/null +++ b/packer/ansible/roles/prusa-slicer/tasks/install.yml @@ -0,0 +1,5 @@ +--- +- name: install slic3r-prusa + apt: + name: slic3r-prusa + state: present diff --git a/packer/ansible/roles/prusa-slicer/tasks/main.yml b/packer/ansible/roles/prusa-slicer/tasks/main.yml new file mode 100644 index 0000000..6f1600a --- /dev/null +++ b/packer/ansible/roles/prusa-slicer/tasks/main.yml @@ -0,0 +1,12 @@ +--- +- block: + - import_tasks: install.yml + tags: + - prusa-slicer:install + + - import_tasks: configure.yml + tags: + - prusa-slicer:configure + + tags: + - prusa-slicer From 9e1f29dfd9e89984a6c47872d7b6b3af9534c0ec Mon Sep 17 00:00:00 2001 From: Jakob Lechner Date: Thu, 14 Sep 2023 22:09:06 +0000 Subject: [PATCH 07/12] Download PrusaSlicer from GitHub --- packer/ansible/playbook.yml | 2 + .../roles/prusa-slicer/defaults/main.yml | 2 + .../files/PrusaGcodeviewer.desktop | 9 +++ .../prusa-slicer/files/PrusaSlicer.desktop | 12 ++++ .../roles/prusa-slicer/tasks/configure.yml | 27 ++++++++- .../tasks/install_from_github.yml | 60 +++++++++++++++++++ .../ansible/roles/prusa-slicer/tasks/main.yml | 8 ++- .../tasks/{install.yml => package.yml} | 0 8 files changed, 117 insertions(+), 3 deletions(-) create mode 100644 packer/ansible/roles/prusa-slicer/defaults/main.yml create mode 100644 packer/ansible/roles/prusa-slicer/files/PrusaGcodeviewer.desktop create mode 100644 packer/ansible/roles/prusa-slicer/files/PrusaSlicer.desktop create mode 100644 packer/ansible/roles/prusa-slicer/tasks/install_from_github.yml rename packer/ansible/roles/prusa-slicer/tasks/{install.yml => package.yml} (100%) diff --git a/packer/ansible/playbook.yml b/packer/ansible/playbook.yml index b994b60..842fcd6 100644 --- a/packer/ansible/playbook.yml +++ b/packer/ansible/playbook.yml @@ -78,6 +78,8 @@ use_inches = 0 version_check = 0 view_mode = expert + tls_accepted_cert_store_location = /etc/ssl/certs/ca-certificates.crt + tls_cert_store_accepted = yes [filaments] AmazonBasics TPU @MINI = 1 diff --git a/packer/ansible/roles/prusa-slicer/defaults/main.yml b/packer/ansible/roles/prusa-slicer/defaults/main.yml new file mode 100644 index 0000000..cd9af8b --- /dev/null +++ b/packer/ansible/roles/prusa-slicer/defaults/main.yml @@ -0,0 +1,2 @@ +--- +prusa_slicer_use_package: false diff --git a/packer/ansible/roles/prusa-slicer/files/PrusaGcodeviewer.desktop b/packer/ansible/roles/prusa-slicer/files/PrusaGcodeviewer.desktop new file mode 100644 index 0000000..51d1b4d --- /dev/null +++ b/packer/ansible/roles/prusa-slicer/files/PrusaGcodeviewer.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Prusa GCode viewer +Exec=/opt/PrusaSlicer/bin/prusa-slicer --gcodeviewer %F +Icon=/opt/PrusaSlicer/resources/icons/PrusaSlicer-gcodeviewer.svg +Terminal=false +Type=Application +MimeType=text/x.gcode; +Categories=Graphics;3DGraphics; +Keywords=3D;Printing;Slicer; diff --git a/packer/ansible/roles/prusa-slicer/files/PrusaSlicer.desktop b/packer/ansible/roles/prusa-slicer/files/PrusaSlicer.desktop new file mode 100644 index 0000000..42680f4 --- /dev/null +++ b/packer/ansible/roles/prusa-slicer/files/PrusaSlicer.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Name=PrusaSlicer +GenericName=3D Printing Software +Terminal=false +Exec=/opt/PrusaSlicer/bin/prusa-slicer %F +Icon=/opt/PrusaSlicer/resources/icons/PrusaSlicer.png +Type=Application +MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf; +Categories=Graphics;3DGraphics;Engineering; +Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA +StartupNotify=false +StartupWMClass=prusa-slicer diff --git a/packer/ansible/roles/prusa-slicer/tasks/configure.yml b/packer/ansible/roles/prusa-slicer/tasks/configure.yml index 817ae54..c59887b 100644 --- a/packer/ansible/roles/prusa-slicer/tasks/configure.yml +++ b/packer/ansible/roles/prusa-slicer/tasks/configure.yml @@ -1,4 +1,12 @@ --- +- set_fact: + prusa_slicer_profiles_directory: /usr/share/PrusaSlicer/profiles + when: prusa_slicer_use_package | bool + +- set_fact: + prusa_slicer_profiles_directory: /opt/PrusaSlicer/resources/profiles + when: not prusa_slicer_use_package | bool + - name: create skel directories file: path: "/etc/skel/{{ item }}" @@ -10,11 +18,26 @@ - name: create symlink to vendor profiles file: - src: /usr/share/PrusaSlicer/profiles/PrusaResearch.ini + src: "{{ prusa_slicer_profiles_directory }}/PrusaResearch.ini" dest: /etc/skel/.config/PrusaSlicer/vendor/PrusaResearch.ini state: link +- name: Stat /opt/PrusaSlicer + stat: + path: /opt/PrusaSlicer + register: prusa_slicer_stat + +- name: Set version + set_fact: + prusa_slicer_version: "{{ prusa_slicer_stat.stat.lnk_target | regex_replace('^/opt/PrusaSlicer-(.*)-[0-9]{12}$', '\\1') }}" + when: prusa_slicer_stat.stat.exists and prusa_slicer_stat.stat.islnk + +- debug: + var: prusa_slicer_version + - name: Copy Prusa slicer settings copy: - content: "{{ prusa_slicer.settings }}" + content: | + version_system_info_sent = {{ prusa_slicer_version | default('') }} + {{ prusa_slicer.settings }} dest: /etc/skel/.config/PrusaSlicer/PrusaSlicer.ini diff --git a/packer/ansible/roles/prusa-slicer/tasks/install_from_github.yml b/packer/ansible/roles/prusa-slicer/tasks/install_from_github.yml new file mode 100644 index 0000000..c191e33 --- /dev/null +++ b/packer/ansible/roles/prusa-slicer/tasks/install_from_github.yml @@ -0,0 +1,60 @@ +--- +- name: Get latest release + uri: + url: https://api.github.com/repos/prusa3d/PrusaSlicer/releases/latest + return_content: true + register: prusa_slicer_release + +- name: Create tarball tempfile + tempfile: + state: file + suffix: .tar.gz + register: prusa_slicer_tarball + +- name: Select asset + set_fact: + prusa_slicer_asset: "{{ asset }}" + when: "asset.name | regex_search('PrusaSlicer-.*linux-x64-GTK3.*\\.tar\\.bz2$')" + loop: "{{ prusa_slicer_release.json.assets }}" + loop_control: + loop_var: asset + label: "{{ asset.name }}" + +- name: Download release file + get_url: + url: "{{ prusa_slicer_asset.browser_download_url }}" + dest: "{{ prusa_slicer_tarball.path }}" + force: true + +- name: Extract tarball + unarchive: + src: "{{ prusa_slicer_tarball.path }}" + dest: /opt + remote_src: true + +- name: Remove tarball + ansible.builtin.file: + path: "{{ prusa_slicer_tarball.path }}" + state: absent + when: prusa_slicer_tarball.path is defined + +- name: Create symlink + file: + src: "/opt/{{ prusa_slicer_directory }}" + dest: "/opt/PrusaSlicer" + state: link + vars: + prusa_slicer_directory: "{{ prusa_slicer_asset.name | regex_replace('\\.tar\\.bz2$', '') }}" + +- name: Create applications directory + file: + path: /usr/local/share/applications/ + state: directory + +- name: Copy desktop files + copy: + src: "{{ item }}.desktop" + dest: /usr/local/share/applications/{{ item }}.desktop + loop: + - PrusaSlicer + - PrusaGcodeviewer diff --git a/packer/ansible/roles/prusa-slicer/tasks/main.yml b/packer/ansible/roles/prusa-slicer/tasks/main.yml index 6f1600a..2487822 100644 --- a/packer/ansible/roles/prusa-slicer/tasks/main.yml +++ b/packer/ansible/roles/prusa-slicer/tasks/main.yml @@ -1,6 +1,12 @@ --- - block: - - import_tasks: install.yml + - import_tasks: package.yml + when: prusa_slicer_use_package | bool + tags: + - prusa-slicer:install + + - import_tasks: install_from_github.yml + when: not prusa_slicer_use_package | bool tags: - prusa-slicer:install diff --git a/packer/ansible/roles/prusa-slicer/tasks/install.yml b/packer/ansible/roles/prusa-slicer/tasks/package.yml similarity index 100% rename from packer/ansible/roles/prusa-slicer/tasks/install.yml rename to packer/ansible/roles/prusa-slicer/tasks/package.yml From 71122c46b6c06b3ab0a60a283f7a8c224df3c351 Mon Sep 17 00:00:00 2001 From: Jakob Lechner Date: Thu, 14 Sep 2023 22:23:54 +0000 Subject: [PATCH 08/12] Add Ultimaker2 to Prusa slicer --- packer/ansible/playbook.yml | 3 +++ packer/ansible/roles/prusa-slicer/tasks/configure.yml | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packer/ansible/playbook.yml b/packer/ansible/playbook.yml index 842fcd6..773a7bc 100644 --- a/packer/ansible/playbook.yml +++ b/packer/ansible/playbook.yml @@ -116,3 +116,6 @@ [vendor:PrusaResearch] model:MK3 = 0.4 model:MK3SMMU2S = 0.4 + + [vendor:Ultimaker] + model:ULTIMAKER2 = 0.4 diff --git a/packer/ansible/roles/prusa-slicer/tasks/configure.yml b/packer/ansible/roles/prusa-slicer/tasks/configure.yml index c59887b..649fb4d 100644 --- a/packer/ansible/roles/prusa-slicer/tasks/configure.yml +++ b/packer/ansible/roles/prusa-slicer/tasks/configure.yml @@ -18,9 +18,12 @@ - name: create symlink to vendor profiles file: - src: "{{ prusa_slicer_profiles_directory }}/PrusaResearch.ini" - dest: /etc/skel/.config/PrusaSlicer/vendor/PrusaResearch.ini + src: "{{ prusa_slicer_profiles_directory }}/{{ item }}.ini" + dest: /etc/skel/.config/PrusaSlicer/vendor/{{ item }}.ini state: link + loop: + - PrusaResearch + - Ultimaker - name: Stat /opt/PrusaSlicer stat: From a649d9686e9f3c5a52cbd8491269d6d01e25a66c Mon Sep 17 00:00:00 2001 From: Jakob Lechner Date: Sun, 1 Oct 2023 19:59:03 +0000 Subject: [PATCH 09/12] Build docker image only when necessary --- .gitlab-ci.yml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 670a6ad..ef8bbab 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ variables: PACKER_VERSION: 1.4.3 ANNOUNCE: http://labsync.lab.fablab-nea.de:6969/announce WEBSEED: http://labsync.lab.fablab-nea.de/labsync/$CI_COMMIT_REF_NAME/$CI_PIPELINE_ID/images - DOCKER_IMAGE_BUILDER: ${CI_REGISTRY_IMAGE}/labsync-builder:$CI_COMMIT_REF_SLUG + DOCKER_IMAGE_BUILDER: ${CI_REGISTRY_IMAGE}/labsync-builder:main DOCKER_IMAGE_SECURITY_SCANNER: ${CI_REGISTRY_IMAGE}/security-scanner:$CI_COMMIT_REF_SLUG DOCKER_TLS_CERTDIR: "" @@ -21,14 +21,26 @@ dockerimage_builder: - apk add --no-cache make services: - docker:dind + variables: + DOCKER_IMAGE_BUILDER: ${CI_REGISTRY_IMAGE}/labsync-builder:$CI_COMMIT_REF_SLUG script: - docker pull $DOCKER_IMAGE_BUILDER || true - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - make builderimg - docker push $DOCKER_IMAGE_BUILDER - except: - refs: - - schedules + - echo "DOCKER_IMAGE_BUILDER=$DOCKER_IMAGE_BUILDER" >> build.env + artifacts: + reports: + dotenv: build.env + rules: + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + when: on_success + - if: + changes: + paths: + - builder + compare_to: main + when: on_success dockerimage_security_scanner: stage: prepare From 0acc97e09eb8c6a7a30b88acd9252b9e47be13d2 Mon Sep 17 00:00:00 2001 From: Jakob Lechner Date: Wed, 4 Oct 2023 15:32:47 +0000 Subject: [PATCH 10/12] Print docker images --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ef8bbab..c1ca052 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -89,6 +89,8 @@ lightburn-download: services: - docker:dind script: + - echo DOCKER_IMAGE_BUILDER=$DOCKER_IMAGE_BUILDER + - echo DOCKER_IMAGE_SECURITY_SCANNER=$DOCKER_IMAGE_SECURITY_SCANNER - scripts/packer.sh debian-bookworm - aws --endpoint-url "$AWS_ENDPOINT_URL" s3 cp images/ "s3://$AWS_BUCKET/$CI_COMMIT_REF_SLUG/$CI_JOB_ID/" --recursive --no-progress artifacts: From 8e8647fdbd5de91f69c95c566393a3bab66a2853 Mon Sep 17 00:00:00 2001 From: Jakob Lechner Date: Wed, 4 Oct 2023 15:30:59 +0000 Subject: [PATCH 11/12] Fix path matching --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c1ca052..aa2492f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,7 +38,7 @@ dockerimage_builder: - if: changes: paths: - - builder + - builder/**/* compare_to: main when: on_success From f6070572faadff6e9bfb0c463417ae1323c534f0 Mon Sep 17 00:00:00 2001 From: Jakob Lechner Date: Wed, 4 Oct 2023 15:11:34 +0000 Subject: [PATCH 12/12] Build security-scanner image only when necessary --- .gitlab-ci.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aa2492f..5b8b6f3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ variables: ANNOUNCE: http://labsync.lab.fablab-nea.de:6969/announce WEBSEED: http://labsync.lab.fablab-nea.de/labsync/$CI_COMMIT_REF_NAME/$CI_PIPELINE_ID/images DOCKER_IMAGE_BUILDER: ${CI_REGISTRY_IMAGE}/labsync-builder:main - DOCKER_IMAGE_SECURITY_SCANNER: ${CI_REGISTRY_IMAGE}/security-scanner:$CI_COMMIT_REF_SLUG + DOCKER_IMAGE_SECURITY_SCANNER: ${CI_REGISTRY_IMAGE}/security-scanner:main DOCKER_TLS_CERTDIR: "" stages: @@ -53,9 +53,19 @@ dockerimage_security_scanner: - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - make secscanimg - docker push $DOCKER_IMAGE_SECURITY_SCANNER - except: - refs: - - schedules + - echo "DOCKER_IMAGE_SECURITY_SCANNER=${CI_REGISTRY_IMAGE}/security-scanner:$CI_COMMIT_REF_SLUG" >> build.env + artifacts: + reports: + dotenv: build.env + rules: + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + when: on_success + - if: + changes: + paths: + - security-scanner/**/* + compare_to: main + when: on_success security_scanner: stage: check