Check FORCE_HTTPS env to be true, upgrade MariaDB vs in docker-compose

This commit is contained in:
FrancescoUK
2018-08-25 16:03:07 +01:00
parent 04b9a181dc
commit 26e33dddec
4 changed files with 4 additions and 3 deletions

View File

@@ -65,7 +65,7 @@ $config['db_log_enabled'] = FALSE;
| a PHP script and you can easily do that on your own.
|
*/
$config['base_url'] = ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') || isset($_ENV['FORCE_HTTPS'])) ? 'https' : 'http';
$config['base_url'] = ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') || (isset($_ENV['FORCE_HTTPS']) && $_ENV['FORCE_HTTPS'] == 'true')) ? 'https' : 'http';
$config['base_url'] .= '://' . $_SERVER['HTTP_HOST'];
$config['base_url'] .= str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']);

View File

@@ -75,7 +75,7 @@
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=84371241b2"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=c206fd4a9f"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=5facd00267"></script>
<!-- end minjs template tags -->
<?php endif; ?>

View File

@@ -28,7 +28,7 @@ services:
- MYSQL_HOST_NAME=mysql
mysql:
image: mariadb:10.1.21
image: mariadb:10.3.9
environment:
- MYSQL_ROOT_PASSWORD=pointofsale
- MYSQL_DATABASE=ospos

View File

@@ -18,6 +18,7 @@ Copyright (c) 2017 Deep Shah (aka deepshah)
Copyright (c) 2017 Joshua Fernandez (aka joshua1234511)
Copyright (c) 2017 odiea
Copyright (c) 2017 asadjaved63
Copyright (c) 2018 WebShells/Shady Sh
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in