Skip to content

Commit 27a4904

Browse files
authored
Merge branch 'master' into master
2 parents a6f1f85 + ba53faf commit 27a4904

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM nginx:1.15.12-alpine
1+
FROM nginx:1.17.5-alpine
22

33
EXPOSE 8000
44
CMD ["/sbin/entrypoint.sh"]

conf/nginx-site.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
server {
22
listen 8000 default; ## Listen for ipv4; this line is default and implied
3+
listen [::]:8000 default; ## Listen for ipv6
34

45
# Make site accessible from http://localhost/
56
server_name localhost;

entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ initialize_system() {
104104
CACHE_DRIVER=${CACHE_DRIVER:-apc}
105105

106106
SESSION_DRIVER=${SESSION_DRIVER:-apc}
107-
SESSION_DOMAIN=${SESSION_DOMAIN:-apc}
107+
SESSION_DOMAIN=${SESSION_DOMAIN:-}
108108
SESSION_SECURE_COOKIE=${SESSION_SECURE_COOKIE:-}
109109

110110
QUEUE_DRIVER=${QUEUE_DRIVER:-database}

0 commit comments

Comments
 (0)