diff --git a/tasks/workstation/linux/software/llm.yml b/tasks/workstation/linux/software/llm.yml index 73f9197..5348a97 100644 --- a/tasks/workstation/linux/software/llm.yml +++ b/tasks/workstation/linux/software/llm.yml @@ -564,6 +564,10 @@ - name: Workstation | Linux | Software | LLMs | runit | open-terminal | AI-Sandbox | Defaults ansible.builtin.set_fact: jdk_jvm: "{{ jdk_jvm | default('/usr/lib/jvm') }}" + jdk_etc: "{{ jdk_etc | default('/etc/java-openjdk') }}" + jdk_etc17: "{{ jdk_etc17 | default('/etc/java17-openjdk') }}" + jdk_etc21: "{{ jdk_etc21 | default('/etc/java21-openjdk') }}" + jdk_etc25: "{{ jdk_etc25 | default('/etc/java25-openjdk') }}" - name: Workstation | Linux | Software | LLMs | runit | open-terminal | AI-Sandbox | AGENTS.md ansible.builtin.copy: @@ -658,12 +662,31 @@ echo "RUN: Updating..." docker pull $image & - # This takes too long. Mount JDK from the host instead. - #if curl -sf --max-time 5 -o /dev/null https://hyperling.com; then - # # Internet is available, pull extra packages. useful for having - # # model compile Android apps, need to verify for Flutter. - # packages="default-jdk xz-utils libglu1-mesa libglu1-mesa ninja-build libnotify-bin libgtk-3-dev liblzma-dev libstdc++-12-dev libc6:amd64 libstdc++6 lib32z1 libbz2-1.0 libncurses-dev android-udev-rules" - #fi + if curl -sf --max-time 5 -o /dev/null https://hyperling.com; then + # Internet is available, pull extra packages. + + # Android, sans default-jdk + packages="$packages \ + libc6:amd64 libncurses-dev libstdc++6 lib32z1 libbz2-1.0 \ + android-udev-rules \ + " + + # Flutter (Main) + packages="$packages \ + curl git unzip xz-utils zip libglu1-mesa libglu1-mesa \ + " + + # Flutter (Linux) + packages="$packages \ + clang cmake git ninja-build pkg-config libgtk-3-dev \ + liblzma-dev libstdc++-12-dev \ + " + + # Flutter (Android) + packages="$packages \ + libc6:amd64 libstdc++6 lib32z1 libbz2-1.0 \ + " + fi # Start the open-terminal program. # https://github.com/open-webui/open-terminal#configuration @@ -675,6 +698,10 @@ -v {{ user_user.home }}/Code:{{ user_user.home }}/Code \ -v {{ user_user.home }}/SDKs:{{ user_user.home }}/SDKs \ -v {{ jdk_jvm }}:{{ jdk_jvm }}:ro \ + -v {{ jdk_etc }}:{{ jdk_etc }}:ro \ + -v {{ jdk_etc17 }}:{{ jdk_etc17 }}:ro \ + -v {{ jdk_etc21 }}:{{ jdk_etc21 }}:ro \ + -v {{ jdk_etc25 }}:{{ jdk_etc25 }}:ro \ -v {{ user_user.home }}/.gradle:{{ user_user.home }}/.gradle \ -v {{ user_user.home }}/.pub_cache:{{ user_user.home }}/.pub_cache \ -e OPEN_TERMINAL_FILE_BROWSER_ROOT="/home/user" \