Skip to content

Commit 4b26e9c

Browse files
authored
Merge pull request #294 from Trim/docker-restart
Docker setup fixes
2 parents 22b2356 + 18506eb commit 4b26e9c

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

deployment/linuxfr-board/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:stretch-slim
1+
FROM ruby:2-slim-buster
22

33
LABEL maintainer="[email protected]"
44
LABEL version="1.0"

deployment/nginx/templates/dlfp.conf.template

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ server {
55
server_name ${DOMAIN};
66

77
location /fonts {
8-
alias /var/linuxfr/fonts;
8+
access_log off;
9+
expires 7d;
10+
root /var/linuxfr/;
911
}
1012

1113
location ~ ^/(avatars|medias)/ {

docker-compose.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ services:
5959
image: mariadb:10.1
6060
env_file:
6161
- deployment/default.env
62-
restart: always
62+
restart: unless-stopped
6363
volumes:
6464
- data-database:/var/lib/mysql
6565

@@ -69,14 +69,14 @@ services:
6969
- deployment/default.env
7070
entrypoint: ["/linuxfr-entrypoint.sh"]
7171
command: ["mysqld"]
72-
restart: always
72+
restart: unless-stopped
7373
volumes:
7474
- data-database-test:/var/lib/mysql
7575
- ./deployment/database-test/entrypoint.sh:/linuxfr-entrypoint.sh
7676

7777
redis:
7878
image: redis:5
79-
restart: always
79+
restart: unless-stopped
8080
volumes:
8181
- data-redis:/data
8282

0 commit comments

Comments
 (0)