ElyBy-Mirror/accounts
1
0
Fork 0
mirror of https://github.com/elyby/accounts.git synced 2024-12-23 22:00:06 +05:30
Code Issues Packages Projects Releases Wiki Activity

Replace basic mariadb image with the bitnami

Browse Source
This commit is contained in:
ErickSkrauch 2019-11-15 20:03:52 +03:00
parent db8e13d749
commit 2fe3ede4ea
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.env-dist
View File

@ -49,9 +49,9 @@ AUTHSERVER_HOST=authserver.ely.by
# LETSENCRYPT_HOST=account.ely.by # LETSENCRYPT_HOST=account.ely.by
# LETSENCRYPT_EMAIL=erickskrauch@ely.by # LETSENCRYPT_EMAIL=erickskrauch@ely.by
# MySQL # MariaDB
MYSQL_ALLOW_EMPTY_PASSWORD=yes ALLOW_EMPTY_PASSWORD=yes
MYSQL_ROOT_PASSWORD= MARIADB_ROOT_PASSWORD=
MYSQL_DATABASE=ely_accounts MARIADB_DATABASE=ely_accounts
MYSQL_USER=ely_accounts_user MARIADB_USER=ely_accounts_user
MYSQL_PASSWORD=ely_accounts_password MARIADB_PASSWORD=ely_accounts_password

10
.gitlab-ci.yml
View File

@ -74,7 +74,7 @@ Codeception:
services: services:
- name: redis:4.0.10-alpine - name: redis:4.0.10-alpine
alias: redis alias: redis
- name: mariadb:10.2.11 - name: bitnami/mariadb:10.3.20-debian-9-r4
alias: db alias: db
variables: variables:
# App config # App config
@ -85,10 +85,10 @@ Codeception:
REDIS_HOST: "redis" REDIS_HOST: "redis"
REDIS_PORT: "6379" REDIS_PORT: "6379"
# MariaDB config # MariaDB config
MYSQL_RANDOM_ROOT_PASSWORD: "true" MARIADB_RANDOM_ROOT_PASSWORD: "true"
MYSQL_DATABASE: "ely_accounts_test" MARIADB_DATABASE: "ely_accounts_test"
MYSQL_USER: "ely_accounts_tester" MARIADB_USER: "ely_accounts_tester"
MYSQL_PASSWORD: "ely_accounts_tester_password" MARIADB_PASSWORD: "ely_accounts_tester_password"
before_script: before_script:
# We don't count code coverage yet, so xdebug can be removed # 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 - sudo rm /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini

10
Dockerfile
View File

@ -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/ COPY ./docker/mariadb/config.cnf /etc/mysql/conf.d/
@ -116,5 +118,7 @@ RUN set -ex \
&& rm -rf /mysql-sys \ && rm -rf /mysql-sys \
&& apt-get purge -y --auto-remove $fetchDeps && apt-get purge -y --auto-remove $fetchDeps
ENTRYPOINT ["docker-entrypoint.sh"] USER 1001
CMD ["mysqld"]
ENTRYPOINT ["/entrypoint.sh"]
CMD ["/run.sh"]