Skip to content

Commit 2096c3c

Browse files
committed
BUILD - Optimize Dockerfile by using alpine as base image
1 parent 51615db commit 2096c3c

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

Dockerfile

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,33 @@
11
# build
2-
FROM debian:stable-slim as build
2+
FROM alpine:3 as build
33

44
WORKDIR /usr/src/app
55

6-
RUN apt-get -y update && apt-get install -y \
6+
RUN apk update && apk upgrade && apk add \
7+
linux-headers \
78
git \
8-
clang \
9+
clang18 \
910
make \
10-
libsqlite3-dev
11+
sqlite-dev
1112

1213
COPY src ./src
1314
COPY vendor ./vendor
1415
COPY .git ./.git
1516
COPY Makefile CMakeLists.txt version.h.in ./
1617

18+
RUN sed -i 's/^CC=clang$/&-18/' Makefile
19+
RUN sed -i 's/^CXX=clang++$/&-18/' Makefile
20+
1721
RUN make -j8
1822

1923
# prod
20-
FROM debian:stable-slim
24+
FROM alpine:3
2125

2226
WORKDIR /usr/src/app
2327

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
2631

2732
COPY --from=build /usr/src/app/bin/fusion /bin/fusion
2833
COPY sql ./sql

src/settings.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#pragma once
22

3+
#include <stdint.h>
34
#include <string>
45

56
namespace settings {
@@ -13,7 +14,7 @@ namespace settings {
1314
extern std::string SHARDSERVERIP;
1415
extern bool LOCALHOSTWORKAROUND;
1516
extern bool ANTICHEAT;
16-
extern time_t TIMEOUT;
17+
extern int64_t TIMEOUT;
1718
extern int VIEWDISTANCE;
1819
extern bool SIMULATEMOBS;
1920
extern int SPAWN_X;

0 commit comments

Comments
 (0)