Added Docker stuff.

This commit is contained in:
mihasinkec 2020-08-03 14:17:17 +02:00
parent 3efed93681
commit 4664dbb642
4 changed files with 53 additions and 5 deletions

15
Dockerfile Normal file
View File

@ -0,0 +1,15 @@
FROM php:7.2-apache
# Use the default production configuration.
RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
RUN docker-php-ext-install mysqli
# Enable rewrite module for httpd.
RUN ln -s /etc/apache2/mods-available/rewrite.load /etc/apache2/mods-enabled/rewrite.load
ADD sna /var/www/html
# Set 20M body size limit and enable short open tags in PHP
RUN sed -i "s/<VirtualHost \*:80>/<VirtualHost \*:80>\n\tLimitRequestBody 20480000\n/" /etc/apache2/sites-enabled/000-default.conf && \
sed -i "s/short_open_tag = Off/short_open_tag = On/" $PHP_INI_DIR/php.ini

27
docker-compose.yml Normal file
View File

@ -0,0 +1,27 @@
version: '3'
services:
app:
build: .
restart: always
ports:
- "5000:80"
volumes:
- <vnesi pot na gostitelju>:/var/www/html/audio
- <vnesi pot na gostitelju>:/var/www/html/comments
- <vnesi pot na gostitelju>:/var/www/html/images
- <vnesi pot na gostitelju>:/var/www/html/images/words
environment:
DB_HOST: db
DB_USER: testuser
DB_PASS: testpass
DB_NAME: digital_atlas
db:
image: "mariadb:10.5-focal"
restart: always
environment:
MYSQL_ROOT_PASSWORD: roottestpass
MYSQL_DATABASE: digital_atlas
MYSQL_USER: testuser
MYSQL_PASSWORD: testpass
volumes:
- <vnesi pot na gostitelju>:/var/lib/mysql

View File

@ -32,6 +32,12 @@ else
$config['base_url'] = 'http://my-server-name.si/sna'; $config['base_url'] = 'http://my-server-name.si/sna';
} }
// Environment variable override
if($conf_var = getenv('BASE_URL')) {
$config['base_url'] = $conf_var;
}
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Index File | Index File
@ -387,7 +393,7 @@ $config['encryption_key'] = '';
$config['sess_driver'] = 'files'; $config['sess_driver'] = 'files';
$config['sess_cookie_name'] = 'ci_session'; $config['sess_cookie_name'] = 'ci_session';
$config['sess_expiration'] = 7200; $config['sess_expiration'] = 7200;
$config['sess_save_path'] = NULL; $config['sess_save_path'] = '/tmp';
$config['sess_match_ip'] = FALSE; $config['sess_match_ip'] = FALSE;
$config['sess_time_to_update'] = 300; $config['sess_time_to_update'] = 300;
$config['sess_regenerate_destroy'] = FALSE; $config['sess_regenerate_destroy'] = FALSE;

View File

@ -75,10 +75,10 @@ $query_builder = TRUE;
$db['default'] = array( $db['default'] = array(
'dsn' => '', 'dsn' => '',
'hostname' => 'localhost', 'hostname' => (getenv('DB_HOST')) ? getenv('DB_HOST') : 'localhost',
'username' => 'nermin', 'username' => (getenv('DB_USER')) ? getenv('DB_USER') : 'nermin',
'password' => '', 'password' => (getenv('DB_PASS')) ? getenv('DB_PASS') : '',
'database' => 'digital_atlas', 'database' => (getenv('DB_NAME')) ? getenv('DB_NAME') : 'digital_atlas',
'dbdriver' => 'mysqli', 'dbdriver' => 'mysqli',
'dbprefix' => '', 'dbprefix' => '',
'pconnect' => FALSE, 'pconnect' => FALSE,