mirror of
https://github.com/elyby/accounts.git
synced 2024-11-09 15:02:19 +05:30
Replace basic mariadb image with the bitnami
This commit is contained in:
parent
db8e13d749
commit
2fe3ede4ea
12
.env-dist
12
.env-dist
@ -49,9 +49,9 @@ AUTHSERVER_HOST=authserver.ely.by
|
||||
# LETSENCRYPT_HOST=account.ely.by
|
||||
# LETSENCRYPT_EMAIL=erickskrauch@ely.by
|
||||
|
||||
# MySQL
|
||||
MYSQL_ALLOW_EMPTY_PASSWORD=yes
|
||||
MYSQL_ROOT_PASSWORD=
|
||||
MYSQL_DATABASE=ely_accounts
|
||||
MYSQL_USER=ely_accounts_user
|
||||
MYSQL_PASSWORD=ely_accounts_password
|
||||
# MariaDB
|
||||
ALLOW_EMPTY_PASSWORD=yes
|
||||
MARIADB_ROOT_PASSWORD=
|
||||
MARIADB_DATABASE=ely_accounts
|
||||
MARIADB_USER=ely_accounts_user
|
||||
MARIADB_PASSWORD=ely_accounts_password
|
||||
|
@ -74,7 +74,7 @@ Codeception:
|
||||
services:
|
||||
- name: redis:4.0.10-alpine
|
||||
alias: redis
|
||||
- name: mariadb:10.2.11
|
||||
- name: bitnami/mariadb:10.3.20-debian-9-r4
|
||||
alias: db
|
||||
variables:
|
||||
# App config
|
||||
@ -85,10 +85,10 @@ Codeception:
|
||||
REDIS_HOST: "redis"
|
||||
REDIS_PORT: "6379"
|
||||
# MariaDB config
|
||||
MYSQL_RANDOM_ROOT_PASSWORD: "true"
|
||||
MYSQL_DATABASE: "ely_accounts_test"
|
||||
MYSQL_USER: "ely_accounts_tester"
|
||||
MYSQL_PASSWORD: "ely_accounts_tester_password"
|
||||
MARIADB_RANDOM_ROOT_PASSWORD: "true"
|
||||
MARIADB_DATABASE: "ely_accounts_test"
|
||||
MARIADB_USER: "ely_accounts_tester"
|
||||
MARIADB_PASSWORD: "ely_accounts_tester_password"
|
||||
before_script:
|
||||
# We don't count code coverage yet, so xdebug can be removed
|
||||
- sudo rm /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
|
||||
|
10
Dockerfile
10
Dockerfile
@ -88,7 +88,9 @@ CMD ["nginx", "-g", "daemon off;"]
|
||||
|
||||
# ================================================================================
|
||||
|
||||
FROM mariadb:10.3.14-bionic AS db
|
||||
FROM bitnami/mariadb:10.3.20-debian-9-r4 AS db
|
||||
|
||||
USER 0
|
||||
|
||||
COPY ./docker/mariadb/config.cnf /etc/mysql/conf.d/
|
||||
|
||||
@ -116,5 +118,7 @@ RUN set -ex \
|
||||
&& rm -rf /mysql-sys \
|
||||
&& apt-get purge -y --auto-remove $fetchDeps
|
||||
|
||||
ENTRYPOINT ["docker-entrypoint.sh"]
|
||||
CMD ["mysqld"]
|
||||
USER 1001
|
||||
|
||||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
CMD ["/run.sh"]
|
||||
|
Loading…
Reference in New Issue
Block a user