diff --git a/Dockerfile b/Dockerfile index 4b4fa54..0174932 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,7 +39,7 @@ RUN \ /tmp/photocraft.deb -L \ "https://github.com/storytold/photocraft/releases/download/${PHOTOCRAFT_RELEASE}/photocraft-$(echo ${PHOTOCRAFT_RELEASE} | sed 's/^v//g')-linux-x86_64.deb" && \ echo "**** install craft suite ****" && \ - for APP in designcraft effectcraft filmcraft lightcraft pdfcraft vectorcraft; do \ + for APP in designcraft effectcraft figcraft filmcraft lightcraft pdfcraft vectorcraft; do \ APP_RELEASE=$(curl -sX GET "https://api.github.com/repos/storytold/${APP}/releases/latest" \ | jq -r '.tag_name') && \ curl -o \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 1f8c0d3..23fb746 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -39,7 +39,7 @@ RUN \ /tmp/photocraft.deb -L \ "https://github.com/storytold/photocraft/releases/download/${PHOTOCRAFT_RELEASE}/photocraft-$(echo ${PHOTOCRAFT_RELEASE} | sed 's/^v//g')-linux-aarch64.deb" && \ echo "**** install craft suite ****" && \ - for APP in designcraft effectcraft filmcraft lightcraft pdfcraft vectorcraft; do \ + for APP in designcraft effectcraft figcraft filmcraft lightcraft pdfcraft vectorcraft; do \ APP_RELEASE=$(curl -sX GET "https://api.github.com/repos/storytold/${APP}/releases/latest" \ | jq -r '.tag_name') && \ curl -o \ diff --git a/Jenkinsfile b/Jenkinsfile index 8f0801e..5a4d07a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -667,7 +667,7 @@ pipeline { --label "org.opencontainers.image.licenses=GPL-3.0-only" \ --label "org.opencontainers.image.ref.name=${COMMIT_SHA}" \ --label "org.opencontainers.image.title=Craft-apps" \ - --label "org.opencontainers.image.description=[ArtCraft](https://getartcraft.com/) is a suite of open source creative applications written in Rust. This image bundles PhotoCraft (image editor), VectorCraft (vector illustration), FilmCraft (video editor), LightCraft (photo library and raw developer), PdfCraft (PDF workbench), EffectCraft (motion graphics and VFX compositor) and DesignCraft (page layout and publishing) in a single desktop." \ + --label "org.opencontainers.image.description=[ArtCraft](https://getartcraft.com/) is a suite of open source creative applications written in Rust. This image bundles PhotoCraft (image editor), VectorCraft (vector illustration), FilmCraft (video editor), LightCraft (photo library and raw developer), PdfCraft (PDF workbench), EffectCraft (motion graphics and VFX compositor), DesignCraft (page layout and publishing) and FigCraft (interface design and prototyping) in a single desktop." \ --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \ --provenance=true --sbom=true --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION="${VERSION_TAG}" --build-arg BUILD_DATE=${GITHUB_DATE} . @@ -755,7 +755,7 @@ pipeline { --label "org.opencontainers.image.licenses=GPL-3.0-only" \ --label "org.opencontainers.image.ref.name=${COMMIT_SHA}" \ --label "org.opencontainers.image.title=Craft-apps" \ - --label "org.opencontainers.image.description=[ArtCraft](https://getartcraft.com/) is a suite of open source creative applications written in Rust. This image bundles PhotoCraft (image editor), VectorCraft (vector illustration), FilmCraft (video editor), LightCraft (photo library and raw developer), PdfCraft (PDF workbench), EffectCraft (motion graphics and VFX compositor) and DesignCraft (page layout and publishing) in a single desktop." \ + --label "org.opencontainers.image.description=[ArtCraft](https://getartcraft.com/) is a suite of open source creative applications written in Rust. This image bundles PhotoCraft (image editor), VectorCraft (vector illustration), FilmCraft (video editor), LightCraft (photo library and raw developer), PdfCraft (PDF workbench), EffectCraft (motion graphics and VFX compositor), DesignCraft (page layout and publishing) and FigCraft (interface design and prototyping) in a single desktop." \ --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \ --provenance=true --sbom=true --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION="${VERSION_TAG}" --build-arg BUILD_DATE=${GITHUB_DATE} . @@ -875,7 +875,7 @@ pipeline { --label "org.opencontainers.image.licenses=GPL-3.0-only" \ --label "org.opencontainers.image.ref.name=${COMMIT_SHA}" \ --label "org.opencontainers.image.title=Craft-apps" \ - --label "org.opencontainers.image.description=[ArtCraft](https://getartcraft.com/) is a suite of open source creative applications written in Rust. This image bundles PhotoCraft (image editor), VectorCraft (vector illustration), FilmCraft (video editor), LightCraft (photo library and raw developer), PdfCraft (PDF workbench), EffectCraft (motion graphics and VFX compositor) and DesignCraft (page layout and publishing) in a single desktop." \ + --label "org.opencontainers.image.description=[ArtCraft](https://getartcraft.com/) is a suite of open source creative applications written in Rust. This image bundles PhotoCraft (image editor), VectorCraft (vector illustration), FilmCraft (video editor), LightCraft (photo library and raw developer), PdfCraft (PDF workbench), EffectCraft (motion graphics and VFX compositor), DesignCraft (page layout and publishing) and FigCraft (interface design and prototyping) in a single desktop." \ --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \ --provenance=true --sbom=true --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION="${VERSION_TAG}" --build-arg BUILD_DATE=${GITHUB_DATE} . diff --git a/README.md b/README.md index f2d2f08..bdccda7 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ Find us at: [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-craft-apps%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-craft-apps/job/master/) [![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fcraft-apps%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/craft-apps/latest/index.html) -[ArtCraft](https://getartcraft.com/) is a suite of open source creative applications written in Rust. This image bundles PhotoCraft (image editor), VectorCraft (vector illustration), FilmCraft (video editor), LightCraft (photo library and raw developer), PdfCraft (PDF workbench), EffectCraft (motion graphics and VFX compositor) and DesignCraft (page layout and publishing) in a single desktop. +[ArtCraft](https://getartcraft.com/) is a suite of open source creative applications written in Rust. This image bundles PhotoCraft (image editor), VectorCraft (vector illustration), FilmCraft (video editor), LightCraft (photo library and raw developer), PdfCraft (PDF workbench), EffectCraft (motion graphics and VFX compositor), DesignCraft (page layout and publishing) and FigCraft (interface design and prototyping) in a single desktop. [![craft-apps](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/artcraft-logo.png)](https://getartcraft.com/) @@ -357,4 +357,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **18.10.26:** - Add FigCraft. * **11.10.26:** - Initial release. diff --git a/readme-vars.yml b/readme-vars.yml index b75f515..0e1ff5e 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -4,7 +4,7 @@ project_name: craft-apps project_url: "https://getartcraft.com/" project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/artcraft-logo.png" -project_blurb: "[ArtCraft]({{ project_url }}) is a suite of open source creative applications written in Rust. This image bundles PhotoCraft (image editor), VectorCraft (vector illustration), FilmCraft (video editor), LightCraft (photo library and raw developer), PdfCraft (PDF workbench), EffectCraft (motion graphics and VFX compositor) and DesignCraft (page layout and publishing) in a single desktop." +project_blurb: "[ArtCraft]({{ project_url }}) is a suite of open source creative applications written in Rust. This image bundles PhotoCraft (image editor), VectorCraft (vector illustration), FilmCraft (video editor), LightCraft (photo library and raw developer), PdfCraft (PDF workbench), EffectCraft (motion graphics and VFX compositor), DesignCraft (page layout and publishing) and FigCraft (interface design and prototyping) in a single desktop." project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" project_blurb_optional_extras_enabled: false project_categories: "Image Editor,Video Editor, Media Tools" @@ -106,4 +106,5 @@ init_diagram: | "craft-apps:latest" <- Base Images # changelog changelogs: + - {date: "18.10.26:", desc: "Add FigCraft."} - {date: "11.10.26:", desc: "Initial release."} diff --git a/root/defaults/autostart b/root/defaults/autostart index f516bce..d8207d5 100755 --- a/root/defaults/autostart +++ b/root/defaults/autostart @@ -1,7 +1,7 @@ #!/bin/bash mkdir -p "${HOME}/Desktop" -for APP in photocraft vectorcraft filmcraft lightcraft pdfcraft effectcraft designcraft; do +for APP in photocraft vectorcraft filmcraft lightcraft pdfcraft effectcraft designcraft figcraft; do if [ ! -f "${HOME}/Desktop/ai.storyteller.${APP}.desktop" ]; then cp "/usr/share/applications/ai.storyteller.${APP}.desktop" "${HOME}/Desktop/" fi diff --git a/root/defaults/autostart_wayland b/root/defaults/autostart_wayland index d235b66..627f119 100755 --- a/root/defaults/autostart_wayland +++ b/root/defaults/autostart_wayland @@ -1,7 +1,7 @@ #!/bin/bash mkdir -p "${HOME}/Desktop" -for APP in photocraft vectorcraft filmcraft lightcraft pdfcraft effectcraft designcraft; do +for APP in photocraft vectorcraft filmcraft lightcraft pdfcraft effectcraft designcraft figcraft; do if [ ! -f "${HOME}/Desktop/ai.storyteller.${APP}.desktop" ]; then cp "/usr/share/applications/ai.storyteller.${APP}.desktop" "${HOME}/Desktop/" fi diff --git a/root/defaults/menu.xml b/root/defaults/menu.xml index de6020f..2662155 100644 --- a/root/defaults/menu.xml +++ b/root/defaults/menu.xml @@ -11,5 +11,6 @@ /usr/bin/pdfcraft /usr/bin/effectcraft /usr/bin/designcraft +/usr/bin/figcraft diff --git a/root/defaults/menu_wayland.xml b/root/defaults/menu_wayland.xml index 7e81216..b7b03f7 100644 --- a/root/defaults/menu_wayland.xml +++ b/root/defaults/menu_wayland.xml @@ -11,5 +11,6 @@ /usr/bin/pdfcraft /usr/bin/effectcraft /usr/bin/designcraft +/usr/bin/figcraft