Skip to content

Commit

Permalink
Minor docker related changes (ACEmulator#2887)
Browse files Browse the repository at this point in the history
* Update docker-compose.arm64

* Update .dockerignore

* Updates
  • Loading branch information
LtRipley36706 authored Apr 6, 2020
1 parent 67ca75f commit 3e30c33
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 14 deletions.
4 changes: 4 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
**/sed/
**/AppVeyor/
**/publish/
**/Config/
**/Dats/
**/Logs/
**/db-data/

# files
Dockerfile*
Expand Down
6 changes: 5 additions & 1 deletion Source/ACE.Server/Command/CommandManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,11 @@ public static void Initialize()
}
}

if (Program.IsRunningInContainer && NonInteractiveConsole) return;
if (NonInteractiveConsole)
{
log.Info("ACEmulator command prompt disabled - Environment.GetEnvironmentVariable(ACE_NONINTERACTIVE_CONSOLE) was true");
return;
}

var thread = new Thread(new ThreadStart(CommandThread));
thread.Name = "Command Manager";
Expand Down
16 changes: 9 additions & 7 deletions docker-compose.arm64
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,28 @@ services:
env_file:
- docker.env
volumes:
- /home/ubuntu/ace/db-data:/config
- ./db-data:/config
ports:
- "3306:3306"
- "3306:3306/tcp"
restart: unless-stopped
healthcheck:
test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]

ace-server:
build: .
build:
context: .
dockerfile: Dockerfile.arm64
image: acemulator/ace:latest-arm64
depends_on:
- ace-db
container_name: ace-server
env_file:
- docker.env
volumes:
- /home/ubuntu/ace/Config:/ace/Config
- /home/ubuntu/ace/Content:/ace/Content
- /home/ubuntu/ace/Dats:/ace/Dats
- /home/ubuntu/ace/Logs:/ace/Logs
- ./Config:/ace/Config
- ./Content:/ace/Content
- ./Dats:/ace/Dats
- ./Logs:/ace/Logs
ports:
- "9000-9001:9000-9001/udp"
#restart: unless-stopped
Expand Down
12 changes: 6 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ services:
env_file:
- docker.env
volumes:
- C:\ACE\db-data:/var/lib/mysql
- ./db-data:/var/lib/mysql
ports:
- "3306:3306"
- "3306:3306/tcp"
restart: unless-stopped
healthcheck:
test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
Expand All @@ -23,10 +23,10 @@ services:
env_file:
- docker.env
volumes:
- C:\ACE\Config:/ace/Config
- C:\ACE\Content:/ace/Content
- C:\ACE\Dats:/ace/Dats
- C:\ACE\Logs:/ace/Logs
- ./Config:/ace/Config
- ./Content:/ace/Content
- ./Dats:/ace/Dats
- ./Logs:/ace/Logs
ports:
- "9000-9001:9000-9001/udp"
#restart: unless-stopped
Expand Down

0 comments on commit 3e30c33

Please sign in to comment.