From 6893a652060b4c5da3768f600a07f42f009e7ffd Mon Sep 17 00:00:00 2001
From: Rodolfo Marques <43847610+razmarques@users.noreply.github.com>
Date: Sun, 29 Dec 2024 15:10:41 +0000
Subject: [PATCH 1/4] Change Containerfile

---
 Containerfile | 55 ++++++++++-----------------------------------------
 1 file changed, 10 insertions(+), 45 deletions(-)

diff --git a/Containerfile b/Containerfile
index 102ac52..f66f346 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,48 +1,13 @@
-# Get base image 
-FROM registry.opensuse.org/opensuse/distrobox:latest
-
 # Set environment variables
-ENV PYCHARM_VERSION=2024.3 \
-    INSTALL_DIR=/opt/pycharm
-
-# Update the system and install required packages
-RUN zypper refresh && zypper -n dup && zypper install -y --no-recommends \
-    python3 \
-    gawk \
-    rstudio-desktop \
-    gh \
-    wget \
-    java-11-openjdk \
-    xz \
-    libXrender1 \
-    libXtst6 \
-    libX11-6 \
-    libXrandr2 \
-    libXi6 \
-    libXinerama1 \
-    fontconfig \
-    freetype2 \
-    && zypper clean -a
-
-# Install poetry
-RUN PYTHON_VERSION=$(python3 --version | awk '{print $2}' | awk -F. '{print $1 $2}') \
-    && sudo zypper install -y python$PYTHON_VERSION-poetry
+ENV FEDORA_VERSION=41
 
-# Install Codium
-RUN sudo zypper ar -p 100 obs://devel:tools:ide:vscode devel_tools_ide_vscode
-RUN sudo zypper --gpg-auto-import-keys ref
-RUN sudo zypper -n in code
+# Get base image
+FROM registry.fedoraproject.org/fedora:${FEDORA_VERSION}
 
-# Download and install PyCharm Community Edition
-USER root
-RUN mkdir -p ${INSTALL_DIR} && \
-    wget -O /tmp/pycharm.tar.gz https://download.jetbrains.com/python/pycharm-community-${PYCHARM_VERSION}.tar.gz && \
-    tar -xzf /tmp/pycharm.tar.gz --strip-components=1 -C ${INSTALL_DIR} && \
-    rm /tmp/pycharm.tar.gz
-
-# Set the working directory
-WORKDIR ${INSTALL_DIR}
-USER ${USER_NAME}
-
-# Add PyCharm bin to PATH
-ENV PATH="${INSTALL_DIR}/bin:$PATH"
+# Update the system and install required packages
+RUN dnf update -y && \
+    dnf copr enable phracek/PyCharm -y && \
+    rpm --import https://packages.microsoft.com/keys/microsoft.asc && \
+    sh -c 'echo -e "[code]\nname=Visual Studio Code\nbaseurl=https://packages.microsoft.com/yumrepos/vscode\nenabled=1\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc" > /etc/yum.repos.d/vscode.repo' && \
+    dnf install -y gtk4 pycharm-community pycharm-community-plugins code
+    dnf clean all

From 8dc89d9e444916e1af0958e55379eb6f16b9abfd Mon Sep 17 00:00:00 2001
From: Rodolfo Marques <43847610+razmarques@users.noreply.github.com>
Date: Sun, 29 Dec 2024 15:12:06 +0000
Subject: [PATCH 2/4] Update build-image.yml

---
 .github/workflows/build-image.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 2be403a..3337416 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -4,9 +4,11 @@ on:
   push:
     branches:
       - main
+      - fedora-base
   pull_request:
     branches:
       - main
+      - fedora-base
 
 jobs:
   build:

From 750db1836dff79208e618b31aeadeafb0f819382 Mon Sep 17 00:00:00 2001
From: Rodolfo Marques <43847610+razmarques@users.noreply.github.com>
Date: Sun, 29 Dec 2024 15:14:08 +0000
Subject: [PATCH 3/4] Change exported apps

---
 main.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.ini b/main.ini
index c62aeaf..5d29b23 100644
--- a/main.ini
+++ b/main.ini
@@ -6,4 +6,4 @@ pull=true
 replace=true
 
 # Export apps
-exported_apps="code rstudio"
+exported_apps="pycharm-community code"

From edf6fbbb497081d8e6bdac22c16f8321fce4bf19 Mon Sep 17 00:00:00 2001
From: Rodolfo Marques <43847610+razmarques@users.noreply.github.com>
Date: Sun, 29 Dec 2024 15:14:36 +0000
Subject: [PATCH 4/4] Update build-image.yml

---
 .github/workflows/build-image.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 3337416..2be403a 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -4,11 +4,9 @@ on:
   push:
     branches:
       - main
-      - fedora-base
   pull_request:
     branches:
       - main
-      - fedora-base
 
 jobs:
   build: