Merge pull request 'nightly' (#2) from metin2/server:nightly into master
Reviewed-on: WildEgo/server#2
This commit is contained in:
commit
ae708d9315
|
@ -10,9 +10,9 @@ Dockerfile
|
||||||
.gitkeep
|
.gitkeep
|
||||||
|
|
||||||
# Compiled quests
|
# Compiled quests
|
||||||
gamefiles/locale/english/quest/object/
|
gamefiles/data/quest/object/
|
||||||
gamefiles/locale/english/quest/pre_qc/
|
gamefiles/data/quest/pre_qc/
|
||||||
gamefiles/locale/english/quest/qc
|
gamefiles/data/quest/qc
|
||||||
|
|
||||||
# Test folder
|
# Test folder
|
||||||
test/
|
test/
|
11
Dockerfile
11
Dockerfile
|
@ -1,6 +1,11 @@
|
||||||
FROM ubuntu:latest as build
|
FROM ubuntu:22.04 as build
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
|
# Set up the CMake repository
|
||||||
|
RUN apt-get update && apt-get install -y ca-certificates gpg wget
|
||||||
|
RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
|
||||||
|
RUN echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ jammy main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null
|
||||||
|
|
||||||
# Update the system and install various dependencies
|
# Update the system and install various dependencies
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y git cmake ninja-build build-essential tar curl zip unzip pkg-config autoconf python3 \
|
apt-get install -y git cmake ninja-build build-essential tar curl zip unzip pkg-config autoconf python3 \
|
||||||
|
@ -21,7 +26,7 @@ RUN mkdir build/
|
||||||
RUN cd build && cmake -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake ..
|
RUN cd build && cmake -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake ..
|
||||||
RUN cd build && make -j $(nproc)
|
RUN cd build && make -j $(nproc)
|
||||||
|
|
||||||
FROM ubuntu:latest as app
|
FROM ubuntu:22.04 as app
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y python2 libdevil-dev libbsd-dev && apt-get clean
|
RUN apt-get update && apt-get install -y python2 libdevil-dev libbsd-dev && apt-get clean
|
||||||
|
@ -35,7 +40,7 @@ COPY --from=build /app/build/src/quest/qc /bin/qc
|
||||||
COPY ./gamefiles/ .
|
COPY ./gamefiles/ .
|
||||||
|
|
||||||
# Compile the quests
|
# Compile the quests
|
||||||
RUN cd /app/locale/english/quest && python2 make.py
|
RUN cd /app/data/quest && python2 make.py
|
||||||
|
|
||||||
# Symlink the configuration files
|
# Symlink the configuration files
|
||||||
RUN ln -s "./conf/CMD" "CMD"
|
RUN ln -s "./conf/CMD" "CMD"
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue