From 2bbfeec304492faf625a5aea22cd2ad52a5193e5 Mon Sep 17 00:00:00 2001 From: Aaron Riedel Date: Sun, 7 Jul 2024 21:57:36 +0200 Subject: [PATCH] get serverfiles from github --- .drone.yml | 14 +++++++------- Dockerfile | 15 ++++++++++----- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.drone.yml b/.drone.yml index e8f864d..e9d7610 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,13 +3,13 @@ type: kubernetes name: darkflame-build steps: -- name: build - image: gcc:13 - commands: - - apt-get update && apt-get install -y cmake - - git clone --recursive https://github.com/DarkflameUniverse/DarkflameServer - - cd DarkflameServer - - ./build.sh -j4 +# - name: build +# image: gcc:13 +# commands: +# - apt-get update && apt-get install -y cmake +# - git clone --recursive https://github.com/DarkflameUniverse/DarkflameServer +# - cd DarkflameServer +# - ./build.sh -j4 - name: docker-build image: plugins/docker settings: diff --git a/Dockerfile b/Dockerfile index b6b3282..259c469 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ FROM debian:12-slim -RUN apt-get update -qq && apt-get install -qq libmariadb3 --no-install-recommends && rm -rf /var/lib/apt/lists/* -ADD https://dlm.mariadb.com/3848227/Connectors/cpp/connector-cpp-1.1.4/mariadb-connector-cpp-1.1.4-debian-bookworm-amd64.tar.gz /root/ -RUN tar -xvzf /root/mariadb-connector-cpp-1.1.4-debian-bookworm-amd64.tar.gz --directory /root -RUN cp /root/mariadb-connector-cpp-1.1.4-debian-bookworm-amd64/lib/mariadb/libmariadbcpp.so /usr/lib/ +RUN apt-get update -qq && apt-get install -qq libmariadb3 unzip --no-install-recommends && rm -rf /var/lib/apt/lists/* +# ADD https://dlm.mariadb.com/3848227/Connectors/cpp/connector-cpp-1.1.4/mariadb-connector-cpp-1.1.4-debian-bookworm-amd64.tar.gz /root/ +# RUN tar -xvzf /root/mariadb-connector-cpp-1.1.4-debian-bookworm-amd64.tar.gz --directory /root +# RUN cp /root/mariadb-connector-cpp-1.1.4-debian-bookworm-amd64/lib/mariadb/libmariadbcpp.so /usr/lib/ ARG PUID=1000 ENV GROUP dockergroup @@ -14,7 +14,12 @@ RUN useradd -u "${PUID}" -m "${USER}" WORKDIR ${HOMEDIR} -COPY ./DarkflameServer/build ${HOMEDIR}/app +ADD https://github.com/DarkflameUniverse/DarkflameServer/releases/latest/download/darkflameserver-linux.zip ${HOMEDIR} +RUN mkdir ${HOMEDIR}/app +WORKDIR ${HOMEDIR}/app +RUN unzip ${HOMEDIR}/darkflameserver-linux.zip +RUN rm ${HOMEDIR}/darkflameserver-linux.zip + COPY ./start.sh ${HOMEDIR}/app/ COPY ./masterconfig.ini ${HOMEDIR}/app/ COPY ./authconfig.ini ${HOMEDIR}/app/