From b42c4db400cb003650477eab5b540ba7d5b696e8 Mon Sep 17 00:00:00 2001 From: Kay Kaprolat Date: Fri, 10 Dec 2021 21:51:49 +0100 Subject: [PATCH] removed spaces from image names --- Docker_Windows.md | 18 +++++++++--------- ...ount Creation.png => Account_Creation.png} | Bin ...l Settings.png => DD_General_Settings.png} | Bin ... Startstop.png => DD_Server_Startstop.png} | Bin ...nished.png => Docker_Compose_Finished.png} | Bin ...ocker_Desktop_Installer_Configuration.png} | Bin ...load Page.png => Docker_Download_Page.png} | Bin ...pen Powershell.png => Open_Powershell.png} | Bin ...{WSL 2 download.png => WSL_2_download.png} | Bin ...{setup finished.png => setup_finished.png} | Bin 10 files changed, 9 insertions(+), 9 deletions(-) rename docker/images/{Account Creation.png => Account_Creation.png} (100%) rename docker/images/{DD General Settings.png => DD_General_Settings.png} (100%) rename docker/images/{DD Server Startstop.png => DD_Server_Startstop.png} (100%) rename docker/images/{Docker Compose Finished.png => Docker_Compose_Finished.png} (100%) rename docker/images/{Docker Desktop Installer Configuration.png => Docker_Desktop_Installer_Configuration.png} (100%) rename docker/images/{Docker Download Page.png => Docker_Download_Page.png} (100%) rename docker/images/{Open Powershell.png => Open_Powershell.png} (100%) rename docker/images/{WSL 2 download.png => WSL_2_download.png} (100%) rename docker/images/{setup finished.png => setup_finished.png} (100%) diff --git a/Docker_Windows.md b/Docker_Windows.md index b4c2f98d..1e0a87d9 100644 --- a/Docker_Windows.md +++ b/Docker_Windows.md @@ -1,12 +1,12 @@ # Installation under Windows ## First Run -1. Navigate to the [Docker download page](https://hub.docker.com/editions/community/docker-ce-desktop-mac/) and download docker. ![Docker Download Page](docker/images/Docker Download Page.png) -2. Once the file has finished downloading, run it and proceed through the installation. Make sure, "Install required Windows components for WSL 2" is checked. ![Docker Desktop Installer Configuration](docker/images/Docker Desktop Installer Configuration.png) +1. Navigate to the [Docker download page](https://hub.docker.com/editions/community/docker-ce-desktop-mac/) and download docker. ![Docker Download Page](docker/images/Docker_Download_Page.png) +2. Once the file has finished downloading, run it and proceed through the installation. Make sure, "Install required Windows components for WSL 2" is checked. ![Docker Desktop Installer Configuration](docker/images/Docker_Desktop_Installer_Configuration.png) 3. If necessary, restart your computer. 4. After the restart, Docker Desktop will automatically open. If it does not, simply start it like any other program. -5. If a window "WSL 2 Installation is incomplete." pops up, follow the link and click "WSL2 Linux kernel update package for x64 machines". Run the downloaded file and once that finishes, click "Restart" in the Docker Desktop window. ![WSL 2 download](docker/images/WSL 2 download.png) +5. If a window "WSL 2 Installation is incomplete." pops up, follow the link and click "WSL2 Linux kernel update package for x64 machines". Run the downloaded file and once that finishes, click "Restart" in the Docker Desktop window. ![WSL 2 download](docker/images/WSL_2_download.png) 6. Wait until Docker Desktop has started. You may skip the tutorial. -7. You may want to disable "OpenDocker Dashboard at startup" in _Settings_ -> _General_ ![Disable Autostart](docker/images/DD General Settings.png) +7. You may want to disable "OpenDocker Dashboard at startup" in _Settings_ -> _General_ ![Disable Autostart](docker/images/DD_General_Settings.png) 8. Download the DarkflameServer repository and extract it to a location of your choice. TODO submodules were not downloaded for me... 9. Inside the extracted folder, copy `.env.example` and name the copy `.env` 10. Open `.env` with notepad by right-clicking it and selecting _Open With_ -> _More apps_ -> _Notepad_. @@ -15,13 +15,13 @@ 13. After `ACCOUNT_MANAGER_SECRET=` paste a "SHA 256-bit Key" from https://keygen.io/ 14. If you are not only hosting a local server, change the value after `EXTERNAL_IP=` to the external IP address of your computer. 15. Change the two values `SECRET_VALUE_CHANGE_ME` to passwords only you know. Save and close the file. -16. In the extracted folder hit Shift+Right Click and select "Open PowerShell window here". ![Open PowerShell](docker/images/Open Powershell.png) +16. In the extracted folder hit Shift+Right Click and select "Open PowerShell window here". ![Open PowerShell](docker/images/Open_Powershell.png) 17. In the new window, paste (with right click) or type `docker-compose up -d --build` and confirm with enter. -18. Once you see the blinking cursor and the path again, setup has finished and the server is already running. ![setup done](docker/images/setup finished.png) -19. Create an admin account by pasting `docker-compose exec darkflame /app/MasterServer -a` and following the prompts. ![admin account creation](docker/images/Account Creation.png) +18. Once you see the blinking cursor and the path again, setup has finished and the server is already running. ![setup done](docker/images/setup_finished.png) +19. Create an admin account by pasting `docker-compose exec darkflame /app/MasterServer -a` and following the prompts. ![admin account creation](docker/images/Account_Creation.png) 20. You can now login with these credentials at `http://your_ip:5000` (replace your_ip with your external IP). There you can create your account for playing as well as generate keys for other people to join; use these at `http://your_ip:5000/activate` ## Normal Use -1. In Docker Desktop you should now see an entry `darkflameserver-main` and when you click on it all containers but `DarkflameSetup` should eventually be green. That means the server is running. ![server running](docker/images/Docker Compose Finished.png) +1. In Docker Desktop you should now see an entry `darkflameserver-main` and when you click on it all containers but `DarkflameSetup` should eventually be green. That means the server is running. ![server running](docker/images/Docker_Compose_Finished.png) 2. For troubleshooting, you can check the logs of the various parts by clicking their entry. -3. You can start and stop the server with the corresponding buttons. Once all containers are grey, the server has shut down, and when all containers but `DarkflameSetup` are green, the server is running. Note that starting and stopping takes some time, please be patient. ![start stop buttons](docker/images/DD Server Startstop.png) +3. You can start and stop the server with the corresponding buttons. Once all containers are grey, the server has shut down, and when all containers but `DarkflameSetup` are green, the server is running. Note that starting and stopping takes some time, please be patient. ![start stop buttons](docker/images/DD_Server_Startstop.png) diff --git a/docker/images/Account Creation.png b/docker/images/Account_Creation.png similarity index 100% rename from docker/images/Account Creation.png rename to docker/images/Account_Creation.png diff --git a/docker/images/DD General Settings.png b/docker/images/DD_General_Settings.png similarity index 100% rename from docker/images/DD General Settings.png rename to docker/images/DD_General_Settings.png diff --git a/docker/images/DD Server Startstop.png b/docker/images/DD_Server_Startstop.png similarity index 100% rename from docker/images/DD Server Startstop.png rename to docker/images/DD_Server_Startstop.png diff --git a/docker/images/Docker Compose Finished.png b/docker/images/Docker_Compose_Finished.png similarity index 100% rename from docker/images/Docker Compose Finished.png rename to docker/images/Docker_Compose_Finished.png diff --git a/docker/images/Docker Desktop Installer Configuration.png b/docker/images/Docker_Desktop_Installer_Configuration.png similarity index 100% rename from docker/images/Docker Desktop Installer Configuration.png rename to docker/images/Docker_Desktop_Installer_Configuration.png diff --git a/docker/images/Docker Download Page.png b/docker/images/Docker_Download_Page.png similarity index 100% rename from docker/images/Docker Download Page.png rename to docker/images/Docker_Download_Page.png diff --git a/docker/images/Open Powershell.png b/docker/images/Open_Powershell.png similarity index 100% rename from docker/images/Open Powershell.png rename to docker/images/Open_Powershell.png diff --git a/docker/images/WSL 2 download.png b/docker/images/WSL_2_download.png similarity index 100% rename from docker/images/WSL 2 download.png rename to docker/images/WSL_2_download.png diff --git a/docker/images/setup finished.png b/docker/images/setup_finished.png similarity index 100% rename from docker/images/setup finished.png rename to docker/images/setup_finished.png