Merge pull request 'docker' (#1) from docker into master
Reviewed-on: #1
This commit is contained in:
commit
6159b7d07e
19
Dockerfile
Normal file
19
Dockerfile
Normal 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
|
||||||
|
|
||||||
|
|
||||||
|
|
2
Makefile
2
Makefile
@ -11,7 +11,7 @@ all: guinness guinnessd
|
|||||||
H_DEP = broadcast.h commands.h defines.h guinnessd.h printlog.h \
|
H_DEP = broadcast.h commands.h defines.h guinnessd.h printlog.h \
|
||||||
xmem.h clients.h config.h drinks.h lists.h tools.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 \
|
D_OBJS = xmem.o broadcast.o printlog.o lists.o tools.o drinks.o \
|
||||||
commands.o clients.o
|
commands.o clients.o
|
||||||
|
4
Makefile.docker
Normal file
4
Makefile.docker
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
.PHONY: build
|
||||||
|
|
||||||
|
build:
|
||||||
|
docker build -t guinnessd:latest .
|
@ -26,6 +26,7 @@
|
|||||||
#include "broadcast.h"
|
#include "broadcast.h"
|
||||||
#include "drinks.h"
|
#include "drinks.h"
|
||||||
|
|
||||||
|
pthread_mutex_t mutex_broadcast;
|
||||||
|
|
||||||
extern Elt *clients_list;
|
extern Elt *clients_list;
|
||||||
extern FILE *outerr;
|
extern FILE *outerr;
|
||||||
|
@ -32,6 +32,8 @@
|
|||||||
#include "commands.h"
|
#include "commands.h"
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
|
pthread_mutex_t mutex_clients;
|
||||||
|
|
||||||
/* Config specifique serveur */
|
/* Config specifique serveur */
|
||||||
char *adr_ip = NULL;
|
char *adr_ip = NULL;
|
||||||
int port = 0;
|
int port = 0;
|
||||||
|
@ -30,8 +30,8 @@ typedef struct userinfos {
|
|||||||
} userinfos;
|
} userinfos;
|
||||||
|
|
||||||
|
|
||||||
pthread_mutex_t mutex_broadcast;
|
extern pthread_mutex_t mutex_broadcast;
|
||||||
pthread_mutex_t mutex_clients;
|
extern pthread_mutex_t mutex_clients;
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
22
picoles/steinlager
Normal file
22
picoles/steinlager
Normal 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@...........|
|
||||||
|
\________ .........................|
|
||||||
|
|.........................|
|
||||||
|
/...........................\
|
||||||
|
|.............................|
|
||||||
|
|.......................|
|
||||||
|
|...............|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user