Skip to content

Commit 9cdabab

Browse files
authored
Merge pull request #40 from magenx/dev
update
2 parents adf408c + 482d456 commit 9cdabab

File tree

2 files changed

+1
-14
lines changed

2 files changed

+1
-14
lines changed

docker-compose.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,7 @@ services:
8787
# MariaDB is a high performing open source relational database
8888
# # ---------------------------------------------------------------------------------------------------------------------#
8989
mariadb:
90-
build:
91-
context: ./mariadb
92-
args:
93-
MARIADB_VERSION:
90+
image: mariadb:${MARIADB_VERSION}
9491
container_name: ${BRAND}-mariadb
9592
hostname: mariadb
9693
environment:
@@ -106,7 +103,6 @@ services:
106103
restart: always
107104
volumes:
108105
- mariadb:/var/lib/mysql
109-
- mariadbcnf:/etc/mysql
110106
- ./mariadb/init.sql.gz:/docker-entrypoint-initdb.d/init.sql.gz:ro
111107
cpu_shares: 1024
112108
mem_limit: 2048m

mariadb/Dockerfile

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)