File tree Expand file tree Collapse file tree 2 files changed +14
-8
lines changed Expand file tree Collapse file tree 2 files changed +14
-8
lines changed Original file line number Diff line number Diff line change 1
1
# build
2
- FROM debian:stable-slim as build
2
+ FROM alpine:3 as build
3
3
4
4
WORKDIR /usr/src/app
5
5
6
- RUN apt-get -y update && apt-get install -y \
6
+ RUN apk update && apk upgrade && apk add \
7
+ linux-headers \
7
8
git \
8
- clang \
9
+ clang18 \
9
10
make \
10
- libsqlite3 -dev
11
+ sqlite -dev
11
12
12
13
COPY src ./src
13
14
COPY vendor ./vendor
14
15
COPY .git ./.git
15
16
COPY Makefile CMakeLists.txt version.h.in ./
16
17
18
+ RUN sed -i 's/^CC=clang$/&-18/' Makefile
19
+ RUN sed -i 's/^CXX=clang++$/&-18/' Makefile
20
+
17
21
RUN make -j8
18
22
19
23
# prod
20
- FROM debian:stable-slim
24
+ FROM alpine:3
21
25
22
26
WORKDIR /usr/src/app
23
27
24
- RUN apt-get -y update && apt-get install -y \
25
- libsqlite3-dev
28
+ RUN apk update && apk upgrade && apk add \
29
+ libstdc++ \
30
+ sqlite-dev
26
31
27
32
COPY --from=build /usr/src/app/bin/fusion /bin/fusion
28
33
COPY sql ./sql
Original file line number Diff line number Diff line change 1
1
#pragma once
2
2
3
+ #include < stdint.h>
3
4
#include < string>
4
5
5
6
namespace settings {
@@ -13,7 +14,7 @@ namespace settings {
13
14
extern std::string SHARDSERVERIP;
14
15
extern bool LOCALHOSTWORKAROUND;
15
16
extern bool ANTICHEAT;
16
- extern time_t TIMEOUT;
17
+ extern int64_t TIMEOUT;
17
18
extern int VIEWDISTANCE;
18
19
extern bool SIMULATEMOBS;
19
20
extern int SPAWN_X;
You can’t perform that action at this time.
0 commit comments