From 859349dccfdada98695613f16890cac57a705efc Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Mon, 29 Jul 2024 23:01:38 +0200 Subject: [PATCH] Add Go & cleanup --- .gitea/workflows/jetbrains.yml | 8 ++++---- jetbrains/go/Dockerfile | 19 +++++++++++++++++++ jetbrains/symfony/Dockerfile | 4 +--- 3 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 jetbrains/go/Dockerfile diff --git a/.gitea/workflows/jetbrains.yml b/.gitea/workflows/jetbrains.yml index beef5be..51bccb4 100644 --- a/.gitea/workflows/jetbrains.yml +++ b/.gitea/workflows/jetbrains.yml @@ -7,11 +7,11 @@ on: - 'main' jobs: - build_act: + build_jetbrains: runs-on: 'priviliged' strategy: matrix: - toolchain: [symfony] + toolchain: [symfony, go] steps: - name: Install Docker run: | @@ -32,8 +32,8 @@ jobs: with: context: "{{defaultContext}}:jetbrains/${{ matrix.toolchain }}" push: true - build-args: JETBRAINS_DEPENDENCIES=fuse fuse-libs libXi libXrender libXtst fontconfig gtk3 tar dbus-libs git just jq fzf + build-args: JETBRAINS_DEPENDENCIES=fuse fuse-libs libXi libXrender libXtst fontconfig gtk3 tar dbus-libs git just jq fzf screen highlight tags: | git.euph.dev/development_tools/distrobox/jetbrains/${{ matrix.toolchain }}:latest git.euph.dev/development_tools/distrobox/jetbrains/${{ matrix.toolchain }}:${{ gitea.run_number }} - + diff --git a/jetbrains/go/Dockerfile b/jetbrains/go/Dockerfile new file mode 100644 index 0000000..75b052d --- /dev/null +++ b/jetbrains/go/Dockerfile @@ -0,0 +1,19 @@ +FROM fedora:40 +ARG JETBRAINS_DEPENDENCIES + +# Set environment variables +ENV BOX_NAME="go" + +# Install required packages and setup sources +RUN dnf install -y \ + $JETBRAINS_DEPENDENCIES \ + golang \ + && dnf clean all \ + && go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest + +# Link outside tooling +RUN alias docker="podman" +RUN ln -s /usr/bin/distrobox-host-exec /usr/local/bin/podman + +# Command to run on container start +CMD ["distrobox-enter", "--name", "$BOX_NAME"] diff --git a/jetbrains/symfony/Dockerfile b/jetbrains/symfony/Dockerfile index c7ad948..3dfef5d 100644 --- a/jetbrains/symfony/Dockerfile +++ b/jetbrains/symfony/Dockerfile @@ -2,15 +2,13 @@ FROM fedora:40 ARG JETBRAINS_DEPENDENCIES # Set environment variables -ENV BOX_NAME="phpstorm" +ENV BOX_NAME="symfony" # Install required packages and setup sources RUN curl -1sLf 'https://dl.cloudsmith.io/public/symfony/stable/setup.rpm.sh' | bash \ && dnf install -y \ $JETBRAINS_DEPENDENCIES \ php \ - screen \ - highlight \ composer \ php-pdo \ php-mysqlnd \