From e6cfba780fbd802e084de091badb3072f478af28 Mon Sep 17 00:00:00 2001 From: = Date: Tue, 24 Oct 2023 09:44:38 +1300 Subject: [PATCH 01/12] trying rpm-ostree java install --- Containerfile | 2 +- config/files/usr/share/ublue-os/just/60-custom.just | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Containerfile b/Containerfile index 05a6060..a2128b0 100644 --- a/Containerfile +++ b/Containerfile @@ -44,7 +44,7 @@ COPY modules /tmp/modules/ # `yq` is used for parsing the yaml configuration # 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 rpm-ostree install -y java-17-openjdk # 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/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: From 61aba4f81327a269f7dcbf432b535e4a82f334a3 Mon Sep 17 00:00:00 2001 From: = Date: Tue, 24 Oct 2023 11:22:31 +1300 Subject: [PATCH 02/12] set path, removed all other instances of Java --- Containerfile | 3 +++ config/files/usr/share/ublue-os/firstboot/yafti.yml | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index a2128b0..070a876 100644 --- a/Containerfile +++ b/Containerfile @@ -44,7 +44,10 @@ COPY modules /tmp/modules/ # `yq` is used for parsing the yaml configuration # 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 +# Install Java RUN rpm-ostree install -y java-17-openjdk +RUN export PATH="/usr/lib/jvm/java-17-openjdk-17.x.y.z/bin:$PATH" + # 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 From bf71c10c5a9c2c956f46949f7de4597724fbaf2b Mon Sep 17 00:00:00 2001 From: = Date: Tue, 24 Oct 2023 11:46:58 +1300 Subject: [PATCH 03/12] try minecraft --- Containerfile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 070a876..e1bf06a 100644 --- a/Containerfile +++ b/Containerfile @@ -46,7 +46,14 @@ COPY modules /tmp/modules/ COPY --from=docker.io/mikefarah/yq /usr/bin/yq /usr/bin/yq # Install Java RUN rpm-ostree install -y java-17-openjdk -RUN export PATH="/usr/lib/jvm/java-17-openjdk-17.x.y.z/bin:$PATH" +RUN export PATH="/usr/lib/jvm/java-17-openjdk-17.0.8.0.7-1.fc38.x86_64/bin:$PATH" + +#install minecraft +RUN mkdir /usr/local/bin/minecraftforge && \ +cd /usr/local/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 # Run the build script, then clean up temp files and finalize container build. RUN chmod +x /tmp/build.sh && /tmp/build.sh && \ From 743fb225b236c904903f64ea04546debca459a91 Mon Sep 17 00:00:00 2001 From: = Date: Tue, 24 Oct 2023 11:56:10 +1300 Subject: [PATCH 04/12] /usr/local does not yet exist, force create -p --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index e1bf06a..b141e96 100644 --- a/Containerfile +++ b/Containerfile @@ -49,7 +49,7 @@ RUN rpm-ostree install -y java-17-openjdk RUN export PATH="/usr/lib/jvm/java-17-openjdk-17.0.8.0.7-1.fc38.x86_64/bin:$PATH" #install minecraft -RUN mkdir /usr/local/bin/minecraftforge && \ +RUN mkdir -p /usr/local/bin/minecraftforge && \ cd /usr/local/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 && \ From 53a1cc70b3358a4d0f1866e3b4acd81e52ac2b89 Mon Sep 17 00:00:00 2001 From: = Date: Tue, 24 Oct 2023 12:03:03 +1300 Subject: [PATCH 05/12] /usr/local does not yet exist, force create -p --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index b141e96..5ad7837 100644 --- a/Containerfile +++ b/Containerfile @@ -49,7 +49,7 @@ RUN rpm-ostree install -y java-17-openjdk RUN export PATH="/usr/lib/jvm/java-17-openjdk-17.0.8.0.7-1.fc38.x86_64/bin:$PATH" #install minecraft -RUN mkdir -p /usr/local/bin/minecraftforge && \ +RUN mkdir ~/usr/local/minecraftforge && \ cd /usr/local/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 && \ From d779c055eae8cd3f90e1189d409910487c5f2e36 Mon Sep 17 00:00:00 2001 From: = Date: Tue, 24 Oct 2023 12:09:56 +1300 Subject: [PATCH 06/12] /usr/local does not yet exist, force create -p --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 5ad7837..a0c55ba 100644 --- a/Containerfile +++ b/Containerfile @@ -49,7 +49,7 @@ RUN rpm-ostree install -y java-17-openjdk RUN export PATH="/usr/lib/jvm/java-17-openjdk-17.0.8.0.7-1.fc38.x86_64/bin:$PATH" #install minecraft -RUN mkdir ~/usr/local/minecraftforge && \ +RUN mkdir /usr/local/minecraftforge && \ cd /usr/local/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 && \ From 245701c273cc960ee714e3a3907019314e73ddf2 Mon Sep 17 00:00:00 2001 From: = Date: Tue, 24 Oct 2023 12:16:17 +1300 Subject: [PATCH 07/12] try installing outside of directory --- Containerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Containerfile b/Containerfile index a0c55ba..486bee6 100644 --- a/Containerfile +++ b/Containerfile @@ -49,9 +49,7 @@ RUN rpm-ostree install -y java-17-openjdk RUN export PATH="/usr/lib/jvm/java-17-openjdk-17.0.8.0.7-1.fc38.x86_64/bin:$PATH" #install minecraft -RUN mkdir /usr/local/minecraftforge && \ -cd /usr/local/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 && \ +RUN 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 From 294340ec2ef8a142d83554653b273bff32415ea6 Mon Sep 17 00:00:00 2001 From: = Date: Tue, 24 Oct 2023 12:51:16 +1300 Subject: [PATCH 08/12] try scripts again --- Containerfile | 9 +-------- config/recipe.yml | 1 + config/scripts/example.sh | 3 +++ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Containerfile b/Containerfile index 486bee6..232bb12 100644 --- a/Containerfile +++ b/Containerfile @@ -44,14 +44,7 @@ COPY modules /tmp/modules/ # `yq` is used for parsing the yaml configuration # 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 -# Install Java -RUN rpm-ostree install -y java-17-openjdk -RUN export PATH="/usr/lib/jvm/java-17-openjdk-17.0.8.0.7-1.fc38.x86_64/bin:$PATH" - -#install minecraft -RUN 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 + # Run the build script, then clean up temp files and finalize container build. RUN chmod +x /tmp/build.sh && /tmp/build.sh && \ diff --git a/config/recipe.yml b/config/recipe.yml index 3918612..2870b10 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..3b60018 100644 --- a/config/scripts/example.sh +++ b/config/scripts/example.sh @@ -8,3 +8,6 @@ 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" \ No newline at end of file From da7a58d22e71022172d153393debff2baf370049 Mon Sep 17 00:00:00 2001 From: = Date: Tue, 24 Oct 2023 13:05:51 +1300 Subject: [PATCH 09/12] usr should exist at this point --- config/scripts/example.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/config/scripts/example.sh b/config/scripts/example.sh index 3b60018..52a82fd 100644 --- a/config/scripts/example.sh +++ b/config/scripts/example.sh @@ -10,4 +10,12 @@ 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" \ No newline at end of file +export PATH="/usr/lib/jvm/java-17-openjdk-17.0.8.0.7-1.fc38.x86_64/bin:$PATH" +echo $PATH + +mkdir /usr/local/bin/minecraftforge && \ +cd /usr/local/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 && \ +ls && \ +rm temp.zip \ No newline at end of file From 88ffd1075e950ce4b0fd64f3e9f2e0c069e51324 Mon Sep 17 00:00:00 2001 From: = Date: Tue, 24 Oct 2023 13:38:52 +1300 Subject: [PATCH 10/12] usr over /usr --- config/scripts/example.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/scripts/example.sh b/config/scripts/example.sh index 52a82fd..7287807 100644 --- a/config/scripts/example.sh +++ b/config/scripts/example.sh @@ -13,9 +13,9 @@ 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/local/bin/minecraftforge && \ -cd /usr/local/bin/minecraftforge && \ +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 && \ -ls && \ -rm temp.zip \ No newline at end of file +unzip temp.zip && \ +rm temp.zip +ls usr/bin \ No newline at end of file From ec1c337e8dc5e21aa868c7dc6636db4fb5c9839d Mon Sep 17 00:00:00 2001 From: = Date: Tue, 27 Feb 2024 08:54:47 +1300 Subject: [PATCH 11/12] temp remove minecraft --- config/scripts/example.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/scripts/example.sh b/config/scripts/example.sh index 7287807..7c505de 100644 --- a/config/scripts/example.sh +++ b/config/scripts/example.sh @@ -13,9 +13,9 @@ 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 +#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 From b0485a4075db5d98a9f25aeceb1638ffbf29089e Mon Sep 17 00:00:00 2001 From: = Date: Tue, 27 Feb 2024 09:03:21 +1300 Subject: [PATCH 12/12] temp remove minecraft --- config/recipe.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/recipe.yml b/config/recipe.yml index 2870b10..77793f4 100644 --- a/config/recipe.yml +++ b/config/recipe.yml @@ -55,4 +55,4 @@ modules: scripts: # this sets up the proper policy & signing files for signed images to work - signing.sh - - example.sh +# - example.sh