Verified Commit c664e256 authored by Marwolf's avatar Marwolf 💬

Fixes to Makefile for shell scripts and adds Docker network for database

parent 1037514a
include .env include .env
#--------------------------------------------------------------- #---------------------------------------------------------------
# Compiles and runs the game client. # Section utilized by various shell scripts within Deployment_Scripts
# Note: Docker for Mac has a networking bug that prevents the client from accessing the game server running in a Docker container. This only works on Linux. start-linux:
sudo `pwd`/Start-Linux.sh
run-server:
sudo `pwd`/Deployment_Scripts/run.sh
run-client: run-client:
sudo ant -f Client_Base/build.xml compile
sudo ant -f Client_Base/build.xml runclient sudo ant -f Client_Base/build.xml runclient
combined-install:
sudo `pwd`/Deployment_Scripts/combined-install.sh
docker-install:
sudo `pwd`/Deployment_Scripts/docker-install.sh
get-updates:
sudo `pwd`/Deployment_Scripts/get-updates.sh
#--------------------------------------------------------------- #---------------------------------------------------------------
# Section for Building the Docker image and pushing to DockerHub # Section for Building the Docker image and pushing to DockerHub
......
...@@ -30,3 +30,8 @@ services: ...@@ -30,3 +30,8 @@ services:
volumes: volumes:
- ./server/inc/databases:/var/lib/mysql - ./server/inc/databases:/var/lib/mysql
- ./server/inc/innodb.cnf:/etc/mysql/conf.d/innodb.cnf:ro - ./server/inc/innodb.cnf:/etc/mysql/conf.d/innodb.cnf:ro
networks:
default:
external:
name: database
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment