Skip to content

Commit

Permalink
Working build, docker-compose with Core3 submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
thmhoag committed Dec 3, 2019
1 parent 4768ab9 commit 257b3e3
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 6 deletions.
7 changes: 3 additions & 4 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
**/tre
**/sql
**/log
**/custom_scripts
**/config
**/win32
**/doc
**/sql
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "Core3"]
path = Core3
url = https://github.com/swgemu/Core3.git
1 change: 1 addition & 0 deletions Core3
Submodule Core3 added at 892565
13 changes: 11 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,19 @@ RUN apt-get install -y build-essential \
default-jre

WORKDIR /app
COPY . .
COPY ./Core3 .

# This is a hack to make the /app folder the root of it's own
# git repo. Without this section git will treat is as a submodule
# of swgemu-docker but will be missing the .git folder and fail all git commands
RUN rm .git
COPY .git/modules/Core3/. .git/
RUN sed -i 's/..\/..\/Core3\///' .git/modules/MMOCoreORB/utils/engine3/config && \
sed -i 's/worktree.*//' .git/config && \
sed -i 's/..\/.git\/modules\/Core3\//.git\//' MMOCoreORB/utils/engine3/.git

WORKDIR /app/MMOCoreORB
RUN make -j8
RUN make -j4

ADD https://github.com/krallin/tini/releases/download/v0.18.0/tini /usr/bin/tini
RUN chmod a+x /usr/bin/tini
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ services:
swgemu:
depends_on:
- database
build: .
image: swgemu:dev
hostname: swgemu_server
container_name: swgemu_server
Expand Down

0 comments on commit 257b3e3

Please sign in to comment.