From 8c25a2c39cb2f5dd8a863a5f48e072c3ed1cccd3 Mon Sep 17 00:00:00 2001 From: wimalopaan Date: Thu, 13 Mar 2025 13:27:02 +0100 Subject: [PATCH 1/4] added gitpod/docker --- .gitpod.yml | 7 +++++++ Dockerfile | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 .gitpod.yml create mode 100644 Dockerfile diff --git a/.gitpod.yml b/.gitpod.yml new file mode 100644 index 00000000000..7b699ed145d --- /dev/null +++ b/.gitpod.yml @@ -0,0 +1,7 @@ +# .gitpod.yml +image: + file: Dockerfile + +tasks: + - init: echo 'Welcome!' +# - command: git clone --recursive https://github.com/STMicroelectronics/STM32CubeG0.git /workspace/STM32CubeG0 && git clone --recursive https://github.com/STMicroelectronics/STM32CubeG4.git /workspace/STM32CubeG4 diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000000..f477e11d116 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,44 @@ +# Dockerfile +FROM archlinux:base +RUN pacman -Syu --noconfirm + +# Install misc packages +RUN pacman -S --noconfirm \ + 7zip \ + arm-none-eabi-gcc \ + arm-none-eabi-newlib \ + base-devel \ + bc \ + cpio \ + curl \ + dos2unix \ + erofs-utils \ + git \ + less \ + nano \ + python \ + python-pip \ + screen \ + tree \ + unzip \ + vim \ + wget \ + zip + +# HACK: Allow base-devel to run with root user +RUN sed -i '/E_ROOT/d' /usr/bin/makepkg + +# Install yay +RUN git clone https://aur.archlinux.org/yay-bin.git /tmp/yay-bin && \ + cd /tmp/yay-bin && \ + makepkg -si --noconfirm && \ + cd && rm -rf /tmp/yay-bin + +#RUN git clone --recursive https://github.com/STMicroelectronics/STM32CubeG0.git /workspace/STM32CubeG0 +#RUN git clone --recursive https://github.com/STMicroelectronics/STM32CubeG4.git /workspace/STM32CubeG4 + +# Personal dir dotfiles +#ADD home /home/ + +# Personal uploader scripts +#ADD root/bin /usr/local/bin/ From e14f405be59d7400bdfda5dccb8cab01e92d4182 Mon Sep 17 00:00:00 2001 From: wimalopaan Date: Thu, 13 Mar 2025 13:51:02 +0100 Subject: [PATCH 2/4] fixed gitpod --- .gitpod.yml | 2 +- Dockerfile | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitpod.yml b/.gitpod.yml index 7b699ed145d..78f84262554 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -4,4 +4,4 @@ image: tasks: - init: echo 'Welcome!' -# - command: git clone --recursive https://github.com/STMicroelectronics/STM32CubeG0.git /workspace/STM32CubeG0 && git clone --recursive https://github.com/STMicroelectronics/STM32CubeG4.git /workspace/STM32CubeG4 + - command: make build && cd build diff --git a/Dockerfile b/Dockerfile index f477e11d116..9fbf9fcf83c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,7 @@ RUN pacman -S --noconfirm \ arm-none-eabi-newlib \ base-devel \ bc \ + cmake \ cpio \ curl \ dos2unix \ @@ -18,6 +19,7 @@ RUN pacman -S --noconfirm \ nano \ python \ python-pip \ + python-pilkit \ screen \ tree \ unzip \ From 8207b0f8695f27f242a73498687454f1c1e22900 Mon Sep 17 00:00:00 2001 From: wimalopaan Date: Thu, 13 Mar 2025 13:57:37 +0100 Subject: [PATCH 3/4] fixed gitpod --- .gitpod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod.yml b/.gitpod.yml index 78f84262554..e56164a7ec6 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -4,4 +4,4 @@ image: tasks: - init: echo 'Welcome!' - - command: make build && cd build + - command: mkdir build && cd build From 31621c0409bce58b0e7584bee223ff5846ed93c1 Mon Sep 17 00:00:00 2001 From: wimalopaan Date: Tue, 14 Oct 2025 22:53:12 +0200 Subject: [PATCH 4/4] added github codespaces devcontainer config --- .devcontainer/Dockerfile | 71 +++++++++++++++++++++++++++++++++ .devcontainer/devcontainer.json | 11 +++++ 2 files changed, 82 insertions(+) create mode 100644 .devcontainer/Dockerfile create mode 100644 .devcontainer/devcontainer.json diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 00000000000..8cc36c6e928 --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,71 @@ +# Dockerfile +FROM archlinux:base +RUN pacman -Syu --noconfirm + +# Install misc packages +RUN pacman -S --noconfirm \ + 7zip \ + arm-none-eabi-gcc \ + arm-none-eabi-newlib \ + avr-gcc \ + avr-libc \ + base-devel \ + bc \ + clang \ + cpio \ + curl \ + cmake \ + dos2unix \ + erofs-utils \ + git \ + less \ + nano \ + platformio-core \ + python \ + python-pip \ + python-pillow \ + python-lz4 \ + python-jinja \ + qt6-base \ + qt5-base \ + qt6-tools \ + qt6-translations \ + qt6-multimedia \ + qt6-serialport \ + qt6-svg \ + qt6-tools \ + screen \ + tree \ + unzip \ + vim \ + wget \ + zip + +# HACK: Allow base-devel to run with root user +RUN sed -i '/E_ROOT/d' /usr/bin/makepkg + +# Install yay +#RUN git clone https://aur.archlinux.org/yay-bin.git /tmp/yay-bin && \ +# cd /tmp/yay-bin && \ +# makepkg -si --noconfirm && \ +# cd && rm -rf /tmp/yay-bin + +#RUN git clone --recursive https://github.com/STMicroelectronics/STM32CubeG0.git /workspace/STM32CubeG0 +#RUN git clone --recursive https://github.com/STMicroelectronics/STM32CubeG4.git /workspace/STM32CubeG4 + +# Personal dir dotfiles +#ADD home /home/ + +# Personal uploader scripts +#ADD root/bin /usr/local/bin/ + +ARG USERNAME=csp +ARG USER_UID=1000 +ARG USER_GID=$USER_UID + +# Create the user +RUN groupadd --gid $USER_GID $USERNAME \ + && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME + +USER $USERNAME + diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000000..1154bccdbe1 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,11 @@ +{ + "name": "Arch Linux Codespace with Dockerfile", + "build": { + "dockerfile": "Dockerfile" + }, + "remoteUser": "csp", + "postCreateCommand": { +// "git1": "git clone --recursive https://github.com/wimalopaan/edgetx.git edgetx.wm" + } +} +