From dd73718fc7391eb18dffa5255ed2c0fec30437c6 Mon Sep 17 00:00:00 2001 From: Anders Rytter Hansen Date: Sat, 15 Jul 2023 10:57:53 +0200 Subject: [PATCH 1/5] Update Dockerfile --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7f42770..0971fbb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,6 @@ wget https://copr.fedorainfracloud.org/coprs/bieszczaders/kernel-cachyos-addons/ # RUN cd /tmp && wget https://mullvad.net/da/download/app/rpm/latest -O mullvad.rpm RUN rpm-ostree override remove firefox firefox-langpacks && \ -#rpm-ostree override remove kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra --install kernel-cachyos-bore-lto && \ rpm-ostree install ksshaskpass uksmd clang clang-devel cronie distrobox fish flatpak-builder gparted libcap-ng-devel libvirt-daemon-driver-lxc libvirt-daemon-lxc lld llvm nvtop procps-ng-devel seadrive-gui virt-manager waydroid && \ rpm-ostree cleanup -m && \ rm -rf /tmp/* /var/* && mkdir -p /var/tmp && chmod -R 1777 /var/tmp && \ From 37954dea39b2e614192fa59f57f5e1abbd1cf655 Mon Sep 17 00:00:00 2001 From: Anders Rytter Hansen Date: Sat, 15 Jul 2023 18:03:52 +0200 Subject: [PATCH 2/5] remove Okular --- Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Dockerfile b/Dockerfile index 0971fbb..ab66242 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,4 +18,9 @@ RUN rpm-ostree override remove firefox firefox-langpacks && \ rpm-ostree install ksshaskpass uksmd clang clang-devel cronie distrobox fish flatpak-builder gparted libcap-ng-devel libvirt-daemon-driver-lxc libvirt-daemon-lxc lld llvm nvtop procps-ng-devel seadrive-gui virt-manager waydroid && \ rpm-ostree cleanup -m && \ rm -rf /tmp/* /var/* && mkdir -p /var/tmp && chmod -R 1777 /var/tmp && \ +ostree container commit + +# remove Okular from base image +RUN rpm-ostree override remove okular && \ +rm -rf /tmp/* /var/* && mkdir -p /var/tmp && chmod -R 1777 /var/tmp && \ ostree container commit \ No newline at end of file From 625185267923d03fd0cb041d2b87d5d65f9632e4 Mon Sep 17 00:00:00 2001 From: Anders Rytter Hansen Date: Sat, 15 Jul 2023 18:05:07 +0200 Subject: [PATCH 3/5] cleanup --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index ab66242..e56089c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,5 +22,6 @@ ostree container commit # remove Okular from base image RUN rpm-ostree override remove okular && \ +rpm-ostree cleanup -m && \ rm -rf /tmp/* /var/* && mkdir -p /var/tmp && chmod -R 1777 /var/tmp && \ ostree container commit \ No newline at end of file From d6164a4fb2f3ddc799b7310be8a625ddd3620699 Mon Sep 17 00:00:00 2001 From: Anders Rytter Hansen Date: Sat, 15 Jul 2023 18:07:06 +0200 Subject: [PATCH 4/5] change order --- Dockerfile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index e56089c..9a195b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,16 +12,11 @@ RUN cd /etc/yum.repos.d/ && \ wget https://copr.fedorainfracloud.org/coprs/bieszczaders/kernel-cachyos/repo/fedora-$(rpm -E %fedora)/bieszczaders-kernel-cachyos-fedora-$(rpm -E %fedora).repo && \ wget https://copr.fedorainfracloud.org/coprs/bieszczaders/kernel-cachyos-addons/repo/fedora-$(rpm -E %fedora)/bieszczaders-kernel-cachyos-addons-fedora-$(rpm -E %fedora).repo -# RUN cd /tmp && wget https://mullvad.net/da/download/app/rpm/latest -O mullvad.rpm +# remove Okular from base image +RUN rpm-ostree override remove okular RUN rpm-ostree override remove firefox firefox-langpacks && \ rpm-ostree install ksshaskpass uksmd clang clang-devel cronie distrobox fish flatpak-builder gparted libcap-ng-devel libvirt-daemon-driver-lxc libvirt-daemon-lxc lld llvm nvtop procps-ng-devel seadrive-gui virt-manager waydroid && \ rpm-ostree cleanup -m && \ rm -rf /tmp/* /var/* && mkdir -p /var/tmp && chmod -R 1777 /var/tmp && \ -ostree container commit - -# remove Okular from base image -RUN rpm-ostree override remove okular && \ -rpm-ostree cleanup -m && \ -rm -rf /tmp/* /var/* && mkdir -p /var/tmp && chmod -R 1777 /var/tmp && \ ostree container commit \ No newline at end of file From 2d6652fd288650ae6edc87440a24e791acd01c70 Mon Sep 17 00:00:00 2001 From: Anders Rytter Hansen Date: Sat, 15 Jul 2023 18:44:14 +0200 Subject: [PATCH 5/5] Update Dockerfile --- Dockerfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9a195b9..2827192 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,11 +12,10 @@ RUN cd /etc/yum.repos.d/ && \ wget https://copr.fedorainfracloud.org/coprs/bieszczaders/kernel-cachyos/repo/fedora-$(rpm -E %fedora)/bieszczaders-kernel-cachyos-fedora-$(rpm -E %fedora).repo && \ wget https://copr.fedorainfracloud.org/coprs/bieszczaders/kernel-cachyos-addons/repo/fedora-$(rpm -E %fedora)/bieszczaders-kernel-cachyos-addons-fedora-$(rpm -E %fedora).repo -# remove Okular from base image -RUN rpm-ostree override remove okular +# remove Okular and Firefox from base image +RUN rpm-ostree override remove firefox firefox-langpacks okular && \ +rpm-ostree install ksshaskpass uksmd clang clang-devel cronie distrobox fish flatpak-builder gparted libcap-ng-devel libvirt-daemon-driver-lxc libvirt-daemon-lxc lld llvm nvtop procps-ng-devel seadrive-gui virt-manager waydroid -RUN rpm-ostree override remove firefox firefox-langpacks && \ -rpm-ostree install ksshaskpass uksmd clang clang-devel cronie distrobox fish flatpak-builder gparted libcap-ng-devel libvirt-daemon-driver-lxc libvirt-daemon-lxc lld llvm nvtop procps-ng-devel seadrive-gui virt-manager waydroid && \ -rpm-ostree cleanup -m && \ +RUN rpm-ostree cleanup -m && \ rm -rf /tmp/* /var/* && mkdir -p /var/tmp && chmod -R 1777 /var/tmp && \ ostree container commit \ No newline at end of file