diff --git a/Containerfile b/Containerfile index 05a6060..232bb12 100644 --- a/Containerfile +++ b/Containerfile @@ -45,6 +45,7 @@ COPY modules /tmp/modules/ # It is copied from the official container image since it's not available as an RPM. COPY --from=docker.io/mikefarah/yq /usr/bin/yq /usr/bin/yq + # Run the build script, then clean up temp files and finalize container build. RUN chmod +x /tmp/build.sh && /tmp/build.sh && \ rm -rf /tmp/* /var/* && ostree container commit diff --git a/config/files/usr/share/ublue-os/firstboot/yafti.yml b/config/files/usr/share/ublue-os/firstboot/yafti.yml index e1185f3..fac6072 100644 --- a/config/files/usr/share/ublue-os/firstboot/yafti.yml +++ b/config/files/usr/share/ublue-os/firstboot/yafti.yml @@ -58,7 +58,6 @@ screens: description: Core system applications for the GNOME desktop environment. default: true packages: - - Eclipse: org.eclipse.Java - Calculator: org.gnome.Calculator - Calendar: org.gnome.Calendar - Camera: org.gnome.Snapshot diff --git a/config/files/usr/share/ublue-os/just/60-custom.just b/config/files/usr/share/ublue-os/just/60-custom.just index 6211fa9..90267fe 100644 --- a/config/files/usr/share/ublue-os/just/60-custom.just +++ b/config/files/usr/share/ublue-os/just/60-custom.just @@ -50,7 +50,6 @@ install-games-educational: # Install virtualization stack (libvirt/virt-manager/etc) install-virtualization: rpm-ostree install libvirt-client libvirt-daemon-kvm virt-install virt-manager - rpm-ostree install -y java-17-openjdk # Un-install virtualization stack (libvirt/virt-manager/etc) uninstall-virtualization: diff --git a/config/recipe.yml b/config/recipe.yml index 3918612..77793f4 100644 --- a/config/recipe.yml +++ b/config/recipe.yml @@ -55,3 +55,4 @@ modules: scripts: # this sets up the proper policy & signing files for signed images to work - signing.sh +# - example.sh diff --git a/config/scripts/example.sh b/config/scripts/example.sh index fdb2e04..7c505de 100644 --- a/config/scripts/example.sh +++ b/config/scripts/example.sh @@ -8,3 +8,14 @@ set -oue pipefail # Your code goes here. echo 'This is an example shell script' echo 'Scripts here will run during build if specified in recipe.yml' +# Install Java +rpm-ostree install -y java-17-openjdk +export PATH="/usr/lib/jvm/java-17-openjdk-17.0.8.0.7-1.fc38.x86_64/bin:$PATH" +echo $PATH + +#mkdir usr/bin/minecraftforge && \ +#cd usr/bin/minecraftforge && \ +#wget "https://maven.minecraftforge.net/net/minecraftforge/forge/1.20.1-47.2.0/forge-1.20.1-47.2.0-mdk.zip" -O temp.zip && \ +#unzip temp.zip && \ +#rm temp.zip +#ls usr/bin \ No newline at end of file