Repository navigation
Add headless CLI CMake options and fix Alpine Dockerfile for v4 - #218
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Adds CMake build options to compile
diecwithout Qt GUI/translation components and updatesDockerfileso headless Alpine Linux v4 builds succeed out of the box (both standalone from theDIE-enginerepository root, as invoked by.github/workflows/docker-image.yml, and from a parentDetect-It-Easycheckout containingDIE-engine_src/).(Rebased onto
26f77b4after horsicq/XArchive#11 merged anddep/XArchiveupdated, removing the temporaryPAGE_SIZEsedguard.)Why These Changes Are Needed
Unconditional Qt GUI / translation dependencies in
src/CMakeLists.txtsrc/CMakeLists.txtpreviously hard-requiredWidgets PrintSupport OpenGL Svg Sql ScriptTools LinguistToolsand always addedgui,lite, anddeploy_add_translationseven when building only--target diec.DIE_BUILD_GUI,DIE_BUILD_LITE, andDIE_BUILD_TRANSLATIONS(all defaulting toON, preserving existing full builds) alongsideDIE_BUILD_UPDATERnarrows headlessdiecdependencies toCore Concurrent+Script(Qt5) /Qml(Qt6), eliminatingqt5-qtsvg-dev,qt5-qttools-dev,libQt5Gui,libQt5Widgets,libQt5Svg, andlibQt5NetworkwhenDIE_BUILD_UPDATER=OFF(while keepingadd_subdirectory(updater)active so staticdie_updater_qtremains available todiec).Broken build context and submodule initialization in
Dockerfile.github/workflows/docker-image.ymlchecks outDIE-enginewithoutsubmodules: recursiveand runsdocker build . --file Dockerfile, whereasDockerfilepreviously expectedCOPY DIE-engine_src .from a parent directory./ctx/DIE-engine_srcvs/ctx, initializing submodules whendep/XArchive/CMakeLists.txtis absent, and resolving databases from/ctx/dbordep/Detect-It-Easyallows both workflows to build cleanly.Shared library symlink extraction and v4 database cleanup in
Dockerfilecp -vonlddpaths copied symlinks without dereferencing targets (cp -Lvcopies resolved shared objects cleanly while skipping/lib/ld-musl-*, which already exists in the basealpine:latestruntime stage).sedworkaround ondep/XOptions/xoptions.cppand deprecateddb_extracopy, and addedX_WITH_PEID=ONpeid_ruleshandling.Verification
alpine:latestviadocker build . --file Dockerfile(~61.5 MB final image).diec --version,diec --showdatabase, andldd /usr/bin/diecinside the runtime container (onlyQt5Core,Qt5Script, and base C++/ICU/compression libraries linked; zero GUI/X11/Network libraries).