Commit Graph

39 Commits

Author SHA1 Message Date
David Markowitz
787dac7cd9
Update Dockerfile (#1126)
Fixes #1124
2023-06-23 08:49:58 -05:00
David Markowitz
bad3845d83
Address Docker issues and remove need to extract cdclient.fdb (#895)
* Implement a server res directory

* Only convert if neither exist

* Remove unzip, Update RegEx

* readme updates

Run setup after setting working dir

Address several docker issues

Revert "Run setup after setting working dir"

This reverts commit fd2fb9228e82a350204c1ef61f7ba059479bb12f.

Fix docker

* Remove extra submodules

* Rework logic

* Switch if block

* Remove need to extract fdb from client

* Change log name

* Update FdbToSqlite.cpp
2023-01-06 23:04:20 -06:00
David Markowitz
56da3f8543
Remove Locale (#808)
* Remove Locale (finally)
2022-11-27 16:56:55 -08:00
Jack Kawell
7c2437173b
Fixed docker installation (#823) 2022-11-07 17:04:20 -06:00
Zac Hayes
7f5ab8b9fa
Dockerfile: Copy dNavigation to build dir (#722)
Fixes an issue where new directory was not copied over to the correct folder for Docker
2022-08-06 22:59:27 -07:00
jumpy-badger
eaa962f265
Add Aarch64 support (#231)
* added mariadb-connector-cpp submodule

* raknet aarch64 support

* fix compile errors

* mariadb connector swap (in progress)

* update CMakeLists, add preprocessor definition to switch between mysql and mariadb connectors

* update types with missing aarch64 check

* corrected adding extra flag to properly compile mariadbconn in CMakeLists

* updated readme with arm builds section

* fix build failure if test folder does not exist

* Remove mysql connector from all builds, add mariadbconnector to windows build

* readd Linux check for backtrace lib to CMakeLists.txt

* Separate system specific mariadbconncpp extra compile flags

* Copy dlls to exes directory once built

* fetch prebuilt binaries on windows so that ClangCL can be used

* Delay load dll so that plugin directory is set correctly

* Fixed typo in glibcxx compile flag

* whitespacing, spaces -> tabs

* Updated README.md, included instructions to update

* Updated README.md

added libssl-dev requirement and removed mysql connector references from macOS builds section

* apple compile fixes for zlib and shared library name

* add windows arm64 checks to raknet

* remove extra . in shared library location

* Setup plugins directory for the connector to search in, pass openssl_root_dir on for apple

* Fix copy paths for single config generators and non windows

* change plugin folder location, another single config generator fix

* GENERATOR_IS_MULTI_CONFIG is a property not a variable

* Fixed a few errors after merge

* Fix plugin directory path, force windows to look at the right folder

* fixed directory name for make_directory command

* Update README.md

Updated MacOS, Windows build instructions.

* set INSTALL_PLUGINDIR so that the right directory is used

* Support for relative rpath for docker build

* added mariadb-connector-cpp submodule

* raknet aarch64 support

* fix compile errors

* mariadb connector swap (in progress)

* update CMakeLists, add preprocessor definition to switch between mysql and mariadb connectors

* update types with missing aarch64 check

* corrected adding extra flag to properly compile mariadbconn in CMakeLists

* updated readme with arm builds section

* fix build failure if test folder does not exist

* Remove mysql connector from all builds, add mariadbconnector to windows build

* readd Linux check for backtrace lib to CMakeLists.txt

* Separate system specific mariadbconncpp extra compile flags

* Copy dlls to exes directory once built

* fetch prebuilt binaries on windows so that ClangCL can be used

* Delay load dll so that plugin directory is set correctly

* Fixed typo in glibcxx compile flag

* whitespacing, spaces -> tabs

* Updated README.md, included instructions to update

* Updated README.md

added libssl-dev requirement and removed mysql connector references from macOS builds section

* apple compile fixes for zlib and shared library name

* add windows arm64 checks to raknet

* Setup plugins directory for the connector to search in, pass openssl_root_dir on for apple

* Fix copy paths for single config generators and non windows

* change plugin folder location, another single config generator fix

* GENERATOR_IS_MULTI_CONFIG is a property not a variable

* Fixed a few errors after merge

* Fix plugin directory path, force windows to look at the right folder

* fixed directory name for make_directory command

* Update README.md

Updated MacOS, Windows build instructions.

* set INSTALL_PLUGINDIR so that the right directory is used

* Support for relative rpath for docker build

* Rebase on main

* Remove extra git submodule

* Update CMakeLists.txt

* Remove CMakeLists.txt file from mariadb

Remove the CMakeLists.txt file from the mariaDBConnector so we dont build the tests.  Also add a config option to the CMakeVariables.txt so you can build the connector with multiple jobs

* Compile on windows

Specify the mariadbcpp.dll file location with a defined absolute path so windows knows it actually exists.

* default to 1 job

Default mariadb jobs running in parallel to 1 instead of 4

* Move mariadbcpp.dll file to the expected directory on windows

* Changed plugin

Updated the plugin location from the project binary directory to the expected location, the mariadb binary directory.

* Addressed windows dll issues by moving files to the expected directory instead of a directory that wouldnt get created

* Update README

Co-authored-by: Aaron Kimbrell <aronwk.aaron@gmail.com>
Co-authored-by: EmosewaMC <39972741+EmosewaMC@users.noreply.github.com>
2022-07-03 21:33:05 -07:00
Shane Clark
d8cde40b49
Fix unhealthy docker containers (#574)
* Add curl to brickfix dockerfile.

* Add curl to AccountManager docker.

* Fix issue preventing container from building.
2022-06-11 19:31:58 -05:00
Nils Bergmann
9a7654806f
Rename build dir to cmake_build 2022-01-05 17:38:53 +01:00
Nils Bergmann
72e2d24c67
Move AccountManager to submodules 2022-01-05 17:32:30 +01:00
Nils Bergmann
dc39acaa75
Fix build for newest changes 2022-01-05 17:21:25 +01:00
Nils Bergmann
f914799b62
Use LUnpack instead of lcdr utils for unpacking the client 2022-01-05 17:21:11 +01:00
Nils Bergmann
d501a85c51
Improve order of execution for start_server.sh
Suggested by @Marcono1234
2021-12-31 14:12:09 +01:00
Nils Bergmann
0f7986ff36
Building now creates log directory by itself 2021-12-14 20:19:00 +01:00
Nils Bergmann
79bcf811d6
Merge pull request #5 from VBMCBoy/readme-improvements
Readme: link to Docker Desktop and on stopping the server
2021-12-14 20:01:30 +01:00
Kay Kaprolat
b42c4db400 removed spaces from image names 2021-12-10 21:51:49 +01:00
Kay Kaprolat
b6648ff596 cropped images and added highlights 2021-12-10 21:19:47 +01:00
Kay Kaprolat
3a7db82004 added currently used images 2021-12-10 21:03:52 +01:00
Nils Bergmann
0bad9d7186
Move utils to submodule 2021-12-09 22:39:54 +01:00
Nils Bergmann
619eec8335
Merge branch 'pr-improvements' into pr-improvements 2021-12-09 17:43:52 +01:00
Jack Kawell
ecd717702d Added client setup check to start_server.sh 2021-12-09 00:20:10 -07:00
Nils Bergmann
7f1e392be2
WIP: add master_ip option 2021-12-08 14:57:16 +01:00
Nils Bergmann
51a9f61e88
WIP: make this work independent of the repo directory 2021-12-08 14:39:19 +01:00
Jack Kawell
293aaff2a5 A few more improvements 2021-12-08 01:54:44 -07:00
Jack Kawell
f185c8b5db Moved all the setup of client files into a single use Docker image 2021-12-08 00:50:15 -07:00
Jack Kawell
a38765d02d fixing my mistakes (aka TheNoim is smarter than me) 2021-12-07 23:44:37 -07:00
Jack Kawell
59f053433c External IP configuration as well as other small improvements 2021-12-07 23:33:34 -07:00
Nils Bergmann
0dfc962df5
WIP: connection issue 2021-12-08 02:40:27 +01:00
Nils Bergmann
cf6f69ba93
WIP: try to fix navmesh load 2021-12-08 00:40:15 +01:00
Jack Kawell
b1e700e2a2 Removed db migrations from script 2021-12-07 14:56:56 -07:00
Nils Bergmann
157977e267
Merge pull request #1 from VBMCBoy/main
Add Brick-Building-Fix and AccountManager
2021-12-07 22:28:37 +01:00
Nils Bergmann
e714cacc58
WIP: produce valid MasterServer binary 2021-12-07 22:25:58 +01:00
Kay Kaprolat
ac20be8744 moved healthchecks from Dockerfiles to docker-compose.yml 2021-12-07 22:17:18 +01:00
Kay Kaprolat
2681ab3828 removed AccountManager secret generation from Dockerfile 2021-12-07 22:09:54 +01:00
Kay Kaprolat
7a55db3f21 moved AccountManager secret to environment 2021-12-07 22:08:53 +01:00
Kay Kaprolat
e01a7be08e added AccountManager 2021-12-07 21:30:08 +01:00
Kay Kaprolat
b35a367ed1 added brick-building fix 2021-12-07 21:25:15 +01:00
Nils Bergmann
9387e88dc0
WIP: still no working MasterServer binary 2021-12-07 20:58:18 +01:00
Nils Bergmann
50221fbd65
WIP: do more post build steps 2021-12-07 16:29:26 +01:00
Nils Bergmann
0add6853bf
WIP: completely automated docker setup 2021-12-07 14:50:05 +01:00