diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml index 88b6284a..907fdfc5 100644 --- a/.github/workflows/dockerhub.yml +++ b/.github/workflows/dockerhub.yml @@ -43,7 +43,7 @@ jobs: password: ${{ secrets.DOCKER_TOKEN }} - name: Generate base Dockerfile - run: go run docker/main.go -i Dockerfile.tmpl -o Dockerfile + run: go run utils/docker/main.go -i Dockerfile.tmpl -o Dockerfile - name: Build and push uses: docker/build-push-action@v6 diff --git a/.github/workflows/image_base.yml b/.github/workflows/image_base.yml index 796cdb8e..efb5b174 100644 --- a/.github/workflows/image_base.yml +++ b/.github/workflows/image_base.yml @@ -70,7 +70,7 @@ jobs: - name: Generate base Dockerfile env: RUNTIME_DOCKERFILE: ${{ inputs.dockerfile || 'Dockerfile' }} - run: go run docker/main.go -i Dockerfile.tmpl -o Dockerfile -client client/dist + run: go run utils/docker/main.go -i Dockerfile.tmpl -o Dockerfile -client client/dist - name: Build and push uses: docker/build-push-action@v6 diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl index 18d37f53..1bb6322f 100644 --- a/Dockerfile.tmpl +++ b/Dockerfile.tmpl @@ -1,14 +1,14 @@ -# This Dockerfile is pre-processed by the ./docker script, it is not meant to be used directly. +# This Dockerfile is pre-processed by the ./utils/docker script, it is not meant to be used directly. -FROM ./runtime/xorg-deps/ AS xorg-deps FROM ./server/ AS server FROM ./client/ AS client +FROM ./utils/xorg-deps/ AS xorg-deps FROM ./runtime/$RUNTIME_DOCKERFILE AS runtime -COPY --from=xorg-deps /usr/local/lib/xorg/modules/drivers/dummy_drv.so /usr/lib/xorg/modules/drivers/dummy_drv.so -COPY --from=xorg-deps /usr/local/lib/xorg/modules/input/neko_drv.so /usr/lib/xorg/modules/input/neko_drv.so COPY --from=server /src/bin/plugins/ /etc/neko/plugins/ COPY --from=server /src/bin/neko /usr/bin/neko COPY --from=client /src/dist/ /var/www +COPY --from=xorg-deps /usr/local/lib/xorg/modules/drivers/dummy_drv.so /usr/lib/xorg/modules/drivers/dummy_drv.so +COPY --from=xorg-deps /usr/local/lib/xorg/modules/input/neko_drv.so /usr/lib/xorg/modules/input/neko_drv.so COPY config.yml /etc/neko/neko.yaml diff --git a/build b/build index 9a2e6d58..5b84d043 100755 --- a/build +++ b/build @@ -318,5 +318,5 @@ docker run --rm -i \ --workdir /src \ --entrypoint go \ golang:1.24-bullseye \ - run ./docker/main.go \ + run utils/docker/main.go \ -i Dockerfile.tmpl -client "$CLIENT_DIST" | build_image $BASE_IMAGE -f - . diff --git a/docker/go.mod b/docker/go.mod deleted file mode 100644 index ee6c7af1..00000000 --- a/docker/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module github.com/m1k1o/neko/docker - -go 1.24.1 diff --git a/server/dev/rebuild.input b/server/dev/rebuild.input index 006ba9c8..bd6a97c6 100755 --- a/server/dev/rebuild.input +++ b/server/dev/rebuild.input @@ -1,6 +1,6 @@ #!/bin/bash cd "$(dirname "$0")" -cd ../../runtime/xorg-deps/xf86-input-neko +cd ../../utils/xorg-deps/xf86-input-neko # # aborting if any command returns a non-zero value diff --git a/utils/docker/go.mod b/utils/docker/go.mod new file mode 100644 index 00000000..62bde8c0 --- /dev/null +++ b/utils/docker/go.mod @@ -0,0 +1,3 @@ +module github.com/m1k1o/neko/utils/docker + +go 1.24.1 diff --git a/docker/main.go b/utils/docker/main.go similarity index 100% rename from docker/main.go rename to utils/docker/main.go diff --git a/runtime/xorg-deps/Dockerfile b/utils/xorg-deps/Dockerfile similarity index 100% rename from runtime/xorg-deps/Dockerfile rename to utils/xorg-deps/Dockerfile diff --git a/runtime/xorg-deps/xf86-input-neko/.gitignore b/utils/xorg-deps/xf86-input-neko/.gitignore similarity index 100% rename from runtime/xorg-deps/xf86-input-neko/.gitignore rename to utils/xorg-deps/xf86-input-neko/.gitignore diff --git a/runtime/xorg-deps/xf86-input-neko/80-neko.conf b/utils/xorg-deps/xf86-input-neko/80-neko.conf similarity index 100% rename from runtime/xorg-deps/xf86-input-neko/80-neko.conf rename to utils/xorg-deps/xf86-input-neko/80-neko.conf diff --git a/runtime/xorg-deps/xf86-input-neko/COPYING b/utils/xorg-deps/xf86-input-neko/COPYING similarity index 100% rename from runtime/xorg-deps/xf86-input-neko/COPYING rename to utils/xorg-deps/xf86-input-neko/COPYING diff --git a/runtime/xorg-deps/xf86-input-neko/Dockerfile b/utils/xorg-deps/xf86-input-neko/Dockerfile similarity index 100% rename from runtime/xorg-deps/xf86-input-neko/Dockerfile rename to utils/xorg-deps/xf86-input-neko/Dockerfile diff --git a/runtime/xorg-deps/xf86-input-neko/Makefile.am b/utils/xorg-deps/xf86-input-neko/Makefile.am similarity index 100% rename from runtime/xorg-deps/xf86-input-neko/Makefile.am rename to utils/xorg-deps/xf86-input-neko/Makefile.am diff --git a/runtime/xorg-deps/xf86-input-neko/README.md b/utils/xorg-deps/xf86-input-neko/README.md similarity index 100% rename from runtime/xorg-deps/xf86-input-neko/README.md rename to utils/xorg-deps/xf86-input-neko/README.md diff --git a/runtime/xorg-deps/xf86-input-neko/autogen-clean.sh b/utils/xorg-deps/xf86-input-neko/autogen-clean.sh similarity index 100% rename from runtime/xorg-deps/xf86-input-neko/autogen-clean.sh rename to utils/xorg-deps/xf86-input-neko/autogen-clean.sh diff --git a/runtime/xorg-deps/xf86-input-neko/autogen.sh b/utils/xorg-deps/xf86-input-neko/autogen.sh similarity index 100% rename from runtime/xorg-deps/xf86-input-neko/autogen.sh rename to utils/xorg-deps/xf86-input-neko/autogen.sh diff --git a/runtime/xorg-deps/xf86-input-neko/configure.ac b/utils/xorg-deps/xf86-input-neko/configure.ac similarity index 100% rename from runtime/xorg-deps/xf86-input-neko/configure.ac rename to utils/xorg-deps/xf86-input-neko/configure.ac diff --git a/runtime/xorg-deps/xf86-input-neko/m4/.gitkeep b/utils/xorg-deps/xf86-input-neko/m4/.gitkeep similarity index 100% rename from runtime/xorg-deps/xf86-input-neko/m4/.gitkeep rename to utils/xorg-deps/xf86-input-neko/m4/.gitkeep diff --git a/runtime/xorg-deps/xf86-input-neko/release.sh b/utils/xorg-deps/xf86-input-neko/release.sh similarity index 100% rename from runtime/xorg-deps/xf86-input-neko/release.sh rename to utils/xorg-deps/xf86-input-neko/release.sh diff --git a/runtime/xorg-deps/xf86-input-neko/src/Makefile.am b/utils/xorg-deps/xf86-input-neko/src/Makefile.am similarity index 100% rename from runtime/xorg-deps/xf86-input-neko/src/Makefile.am rename to utils/xorg-deps/xf86-input-neko/src/Makefile.am diff --git a/runtime/xorg-deps/xf86-input-neko/src/neko.c b/utils/xorg-deps/xf86-input-neko/src/neko.c similarity index 100% rename from runtime/xorg-deps/xf86-input-neko/src/neko.c rename to utils/xorg-deps/xf86-input-neko/src/neko.c diff --git a/runtime/xorg-deps/xf86-input-neko/xorg-neko.pc.in b/utils/xorg-deps/xf86-input-neko/xorg-neko.pc.in similarity index 100% rename from runtime/xorg-deps/xf86-input-neko/xorg-neko.pc.in rename to utils/xorg-deps/xf86-input-neko/xorg-neko.pc.in diff --git a/runtime/xorg-deps/xf86-video-dummy/01_v0.3.8_xdummy-randr.patch b/utils/xorg-deps/xf86-video-dummy/01_v0.3.8_xdummy-randr.patch similarity index 100% rename from runtime/xorg-deps/xf86-video-dummy/01_v0.3.8_xdummy-randr.patch rename to utils/xorg-deps/xf86-video-dummy/01_v0.3.8_xdummy-randr.patch diff --git a/runtime/xorg-deps/xf86-video-dummy/README.md b/utils/xorg-deps/xf86-video-dummy/README.md similarity index 100% rename from runtime/xorg-deps/xf86-video-dummy/README.md rename to utils/xorg-deps/xf86-video-dummy/README.md diff --git a/runtime/xorg-deps/xf86-video-dummy/v0.3.8/COPYING b/utils/xorg-deps/xf86-video-dummy/v0.3.8/COPYING similarity index 100% rename from runtime/xorg-deps/xf86-video-dummy/v0.3.8/COPYING rename to utils/xorg-deps/xf86-video-dummy/v0.3.8/COPYING diff --git a/runtime/xorg-deps/xf86-video-dummy/v0.3.8/ChangeLog b/utils/xorg-deps/xf86-video-dummy/v0.3.8/ChangeLog similarity index 100% rename from runtime/xorg-deps/xf86-video-dummy/v0.3.8/ChangeLog rename to utils/xorg-deps/xf86-video-dummy/v0.3.8/ChangeLog diff --git a/runtime/xorg-deps/xf86-video-dummy/v0.3.8/Makefile.am b/utils/xorg-deps/xf86-video-dummy/v0.3.8/Makefile.am similarity index 100% rename from runtime/xorg-deps/xf86-video-dummy/v0.3.8/Makefile.am rename to utils/xorg-deps/xf86-video-dummy/v0.3.8/Makefile.am diff --git a/runtime/xorg-deps/xf86-video-dummy/v0.3.8/Makefile.in b/utils/xorg-deps/xf86-video-dummy/v0.3.8/Makefile.in similarity index 100% rename from runtime/xorg-deps/xf86-video-dummy/v0.3.8/Makefile.in rename to utils/xorg-deps/xf86-video-dummy/v0.3.8/Makefile.in diff --git a/runtime/xorg-deps/xf86-video-dummy/v0.3.8/README b/utils/xorg-deps/xf86-video-dummy/v0.3.8/README similarity index 100% rename from runtime/xorg-deps/xf86-video-dummy/v0.3.8/README rename to utils/xorg-deps/xf86-video-dummy/v0.3.8/README diff --git a/runtime/xorg-deps/xf86-video-dummy/v0.3.8/aclocal.m4 b/utils/xorg-deps/xf86-video-dummy/v0.3.8/aclocal.m4 similarity index 100% rename from runtime/xorg-deps/xf86-video-dummy/v0.3.8/aclocal.m4 rename to utils/xorg-deps/xf86-video-dummy/v0.3.8/aclocal.m4 diff --git a/runtime/xorg-deps/xf86-video-dummy/v0.3.8/compile b/utils/xorg-deps/xf86-video-dummy/v0.3.8/compile similarity index 100% rename from runtime/xorg-deps/xf86-video-dummy/v0.3.8/compile rename to utils/xorg-deps/xf86-video-dummy/v0.3.8/compile diff --git a/runtime/xorg-deps/xf86-video-dummy/v0.3.8/config.guess b/utils/xorg-deps/xf86-video-dummy/v0.3.8/config.guess similarity index 100% rename from runtime/xorg-deps/xf86-video-dummy/v0.3.8/config.guess rename to utils/xorg-deps/xf86-video-dummy/v0.3.8/config.guess diff --git a/runtime/xorg-deps/xf86-video-dummy/v0.3.8/config.h.in b/utils/xorg-deps/xf86-video-dummy/v0.3.8/config.h.in similarity index 100% rename from runtime/xorg-deps/xf86-video-dummy/v0.3.8/config.h.in rename to utils/xorg-deps/xf86-video-dummy/v0.3.8/config.h.in diff --git a/runtime/xorg-deps/xf86-video-dummy/v0.3.8/config.sub b/utils/xorg-deps/xf86-video-dummy/v0.3.8/config.sub similarity index 100% rename from runtime/xorg-deps/xf86-video-dummy/v0.3.8/config.sub rename to utils/xorg-deps/xf86-video-dummy/v0.3.8/config.sub diff --git a/runtime/xorg-deps/xf86-video-dummy/v0.3.8/configure b/utils/xorg-deps/xf86-video-dummy/v0.3.8/configure similarity index 100% rename from runtime/xorg-deps/xf86-video-dummy/v0.3.8/configure rename to utils/xorg-deps/xf86-video-dummy/v0.3.8/configure diff --git a/runtime/xorg-deps/xf86-video-dummy/v0.3.8/configure.ac b/utils/xorg-deps/xf86-video-dummy/v0.3.8/configure.ac similarity index 100% rename from runtime/xorg-deps/xf86-video-dummy/v0.3.8/configure.ac rename to utils/xorg-deps/xf86-video-dummy/v0.3.8/configure.ac diff --git a/runtime/xorg-deps/xf86-video-dummy/v0.3.8/depcomp b/utils/xorg-deps/xf86-video-dummy/v0.3.8/depcomp similarity index 100% rename from runtime/xorg-deps/xf86-video-dummy/v0.3.8/depcomp rename to utils/xorg-deps/xf86-video-dummy/v0.3.8/depcomp diff --git a/runtime/xorg-deps/xf86-video-dummy/v0.3.8/install-sh b/utils/xorg-deps/xf86-video-dummy/v0.3.8/install-sh similarity index 100% rename from runtime/xorg-deps/xf86-video-dummy/v0.3.8/install-sh rename to utils/xorg-deps/xf86-video-dummy/v0.3.8/install-sh diff --git a/runtime/xorg-deps/xf86-video-dummy/v0.3.8/ltmain.sh b/utils/xorg-deps/xf86-video-dummy/v0.3.8/ltmain.sh similarity index 100% rename from runtime/xorg-deps/xf86-video-dummy/v0.3.8/ltmain.sh rename to utils/xorg-deps/xf86-video-dummy/v0.3.8/ltmain.sh diff --git a/runtime/xorg-deps/xf86-video-dummy/v0.3.8/missing b/utils/xorg-deps/xf86-video-dummy/v0.3.8/missing similarity index 100% rename from runtime/xorg-deps/xf86-video-dummy/v0.3.8/missing rename to utils/xorg-deps/xf86-video-dummy/v0.3.8/missing diff --git a/runtime/xorg-deps/xf86-video-dummy/v0.3.8/src/Makefile.am b/utils/xorg-deps/xf86-video-dummy/v0.3.8/src/Makefile.am similarity index 100% rename from runtime/xorg-deps/xf86-video-dummy/v0.3.8/src/Makefile.am rename to utils/xorg-deps/xf86-video-dummy/v0.3.8/src/Makefile.am diff --git a/runtime/xorg-deps/xf86-video-dummy/v0.3.8/src/Makefile.in b/utils/xorg-deps/xf86-video-dummy/v0.3.8/src/Makefile.in similarity index 100% rename from runtime/xorg-deps/xf86-video-dummy/v0.3.8/src/Makefile.in rename to utils/xorg-deps/xf86-video-dummy/v0.3.8/src/Makefile.in diff --git a/runtime/xorg-deps/xf86-video-dummy/v0.3.8/src/compat-api.h b/utils/xorg-deps/xf86-video-dummy/v0.3.8/src/compat-api.h similarity index 100% rename from runtime/xorg-deps/xf86-video-dummy/v0.3.8/src/compat-api.h rename to utils/xorg-deps/xf86-video-dummy/v0.3.8/src/compat-api.h diff --git a/runtime/xorg-deps/xf86-video-dummy/v0.3.8/src/dummy.h b/utils/xorg-deps/xf86-video-dummy/v0.3.8/src/dummy.h similarity index 100% rename from runtime/xorg-deps/xf86-video-dummy/v0.3.8/src/dummy.h rename to utils/xorg-deps/xf86-video-dummy/v0.3.8/src/dummy.h diff --git a/runtime/xorg-deps/xf86-video-dummy/v0.3.8/src/dummy_cursor.c b/utils/xorg-deps/xf86-video-dummy/v0.3.8/src/dummy_cursor.c similarity index 100% rename from runtime/xorg-deps/xf86-video-dummy/v0.3.8/src/dummy_cursor.c rename to utils/xorg-deps/xf86-video-dummy/v0.3.8/src/dummy_cursor.c diff --git a/runtime/xorg-deps/xf86-video-dummy/v0.3.8/src/dummy_dga.c b/utils/xorg-deps/xf86-video-dummy/v0.3.8/src/dummy_dga.c similarity index 100% rename from runtime/xorg-deps/xf86-video-dummy/v0.3.8/src/dummy_dga.c rename to utils/xorg-deps/xf86-video-dummy/v0.3.8/src/dummy_dga.c diff --git a/runtime/xorg-deps/xf86-video-dummy/v0.3.8/src/dummy_driver.c b/utils/xorg-deps/xf86-video-dummy/v0.3.8/src/dummy_driver.c similarity index 100% rename from runtime/xorg-deps/xf86-video-dummy/v0.3.8/src/dummy_driver.c rename to utils/xorg-deps/xf86-video-dummy/v0.3.8/src/dummy_driver.c