Compare commits

..

3 Commits

Author SHA1 Message Date
6159b7d07e Merge pull request 'docker' (#1) from docker into master
Reviewed-on: #1
2025-10-05 10:52:27 +11:00
mco-system
58c7549e65 fix: use extern mutex and COPT -fPIE -Wno-error. Add Dockerfile 2025-10-05 10:50:44 +11:00
mco-system
25ccec2fd3 WIP: missing picoles dir 2025-10-05 10:32:35 +11:00
7 changed files with 51 additions and 3 deletions

19
Dockerfile Normal file
View File

@ -0,0 +1,19 @@
FROM debian:12 AS guinnessd-base
RUN apt-get update && \
apt-get upgrade -y && \
apt-get install -y make gcc && \
useradd -m -d /home/guinness -s /bin/false -r guinness
FROM guinnessd-base
COPY . /home/guinness/src
WORKDIR /home/guinness
RUN make -C /home/guinness/src && \
mv /home/guinness/src/guinnessd /usr/local/bin && \
mv /home/guinness/src/picoles /usr/local/share && \
chmod +x /usr/local/bin/guinnessd && \
rm -Rf /home/guinness/src && \
apt-get remove -y make gcc && \
apt-get autoremove -y

View File

@ -11,7 +11,7 @@ all: guinness guinnessd
H_DEP = broadcast.h commands.h defines.h guinnessd.h printlog.h \
xmem.h clients.h config.h drinks.h lists.h tools.h
COPT = -Wall -g
COPT = -fPIE -Wno-error -g
D_OBJS = xmem.o broadcast.o printlog.o lists.o tools.o drinks.o \
commands.o clients.o

4
Makefile.docker Normal file
View File

@ -0,0 +1,4 @@
.PHONY: build
build:
docker build -t guinnessd:latest .

View File

@ -26,6 +26,7 @@
#include "broadcast.h"
#include "drinks.h"
pthread_mutex_t mutex_broadcast;
extern Elt *clients_list;
extern FILE *outerr;

View File

@ -32,6 +32,8 @@
#include "commands.h"
#include "config.h"
pthread_mutex_t mutex_clients;
/* Config specifique serveur */
char *adr_ip = NULL;
int port = 0;

View File

@ -30,8 +30,8 @@ typedef struct userinfos {
} userinfos;
pthread_mutex_t mutex_broadcast;
pthread_mutex_t mutex_clients;
extern pthread_mutex_t mutex_broadcast;
extern pthread_mutex_t mutex_clients;
#endif

22
picoles/steinlager Normal file
View File

@ -0,0 +1,22 @@
.sssssssss.
.sssssssssssssssssss
sssssssssssssssssssssssss
ssssssssssssssssssssssssssss
@@sssssssssssssssssssssss@ss
|s@@@@sssssssssssssss@@@@s|s
_______|sssss@@@@@sssss@@@@@sssss|s
/ sssssssss@sssss@sssssssss|s
/ .------+.ssssssss@sssss@ssssssss.|
/ / |...sssssss@sss@sssssss...|
| | |.......sss@sss@ssss......|
| | |..........s@ss@sss.......|
| | |...........@ss@..........|
\ \ |............ss@..........|
\ '------+...........ss@...........|
\________ .........................|
|.........................|
/...........................\
|.............................|
|.......................|
|...............|