OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-23 21:50:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: OpenPunk:c61450d26027bb9e0755dfb7e226ed07cf87197d
Branches Tags
OpenPunk:master
OpenPunk:landlock
OpenPunk:lua-more-better
OpenPunk:refactor
OpenPunk:win32-x86
OpenPunk:patchmap
OpenPunk:lua
OpenPunk:1.6
OpenPunk:1.5.2
OpenPunk:1.5.1
OpenPunk:1.5
OpenPunk:1.4
OpenPunk:1.3
OpenPunk:1.2.1
OpenPunk:1.2
OpenPunk:1.1
OpenPunk:1.0
...
compare: OpenPunk:6ea22ffbdf98252509d1f348719d6beb4fa7f1b8
Branches Tags
OpenPunk:master
OpenPunk:landlock
OpenPunk:lua-more-better
OpenPunk:refactor
OpenPunk:win32-x86
OpenPunk:patchmap
OpenPunk:lua
OpenPunk:1.6
OpenPunk:1.5.2
OpenPunk:1.5.1
OpenPunk:1.5
OpenPunk:1.4
OpenPunk:1.3
OpenPunk:1.2.1
OpenPunk:1.2
OpenPunk:1.1
OpenPunk:1.0

3 Commits
c61450d260 ... 6ea22ffbdf

Author SHA1 Message Date
Juansecu
6ea22ffbdf
Merge 2096c3c3cc into 145113062b 2024-10-05 16:53:20 -05:00
CakeLancelot
145113062b Update tdata reference to fix invalid label 2024-10-05 16:51:39 -05:00
Juansecu
2096c3c3cc BUILD - Optimize Dockerfile by using alpine as base image 2024-06-08 21:55:03 -05:00
3 changed files with 15 additions and 9 deletions
Show Stats Expand all files Collapse all files

19
Dockerfile
View File

@ -1,28 +1,33 @@
# build # build
FROM debian:stable-slim as build FROM alpine:3 as build
WORKDIR /usr/src/app WORKDIR /usr/src/app
RUN apt-get -y update && apt-get install -y \ RUN apk update && apk upgrade && apk add \
linux-headers \
git \ git \
clang \ clang18 \
make \ make \
libsqlite3-dev sqlite-dev
COPY src ./src COPY src ./src
COPY vendor ./vendor COPY vendor ./vendor
COPY .git ./.git COPY .git ./.git
COPY Makefile CMakeLists.txt version.h.in ./ COPY Makefile CMakeLists.txt version.h.in ./
RUN sed -i 's/^CC=clang$/&-18/' Makefile
RUN sed -i 's/^CXX=clang++$/&-18/' Makefile
RUN make -j8 RUN make -j8
# prod # prod
FROM debian:stable-slim FROM alpine:3
WORKDIR /usr/src/app WORKDIR /usr/src/app
RUN apt-get -y update && apt-get install -y \ RUN apk update && apk upgrade && apk add \
libsqlite3-dev libstdc++ \
sqlite-dev
COPY --from=build /usr/src/app/bin/fusion /bin/fusion COPY --from=build /usr/src/app/bin/fusion /bin/fusion
COPY sql ./sql COPY sql ./sql

3
src/settings.hpp
View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include <stdint.h>
#include <string> #include <string>
namespace settings { namespace settings {
@ -14,7 +15,7 @@ namespace settings {
extern std::string SHARDSERVERIP; extern std::string SHARDSERVERIP;
extern bool LOCALHOSTWORKAROUND; extern bool LOCALHOSTWORKAROUND;
extern bool ANTICHEAT; extern bool ANTICHEAT;
extern time_t TIMEOUT; extern int64_t TIMEOUT;
extern int VIEWDISTANCE; extern int VIEWDISTANCE;
extern bool SIMULATEMOBS; extern bool SIMULATEMOBS;
extern int SPAWN_X; extern int SPAWN_X;

2
tdata

@ -1 +1 @@
Subproject commit 40c1dd14938f41684bb19c946828b9162ea4239e Subproject commit bdb611b092b43b2490f9f3866374a49d811c0826