diff options
| author | startxfr <clarue@startx.fr> | 2015-11-28 23:32:45 +0100 |
|---|---|---|
| committer | startxfr <clarue@startx.fr> | 2015-11-28 23:32:45 +0100 |
| commit | a490cfe364a242b1e9993225758ea6e61369e363 (patch) | |
| tree | f4699d33f476c79a99db91781697c6b552a7b30e /Services/mariadb | |
| parent | 42c264a48c9d7df0b5e55be370436e3ec0bb7667 (diff) | |
| download | phpmyadmin-a490cfe364a242b1e9993225758ea6e61369e363.tar.gz phpmyadmin-a490cfe364a242b1e9993225758ea6e61369e363.tar.bz2 phpmyadmin-a490cfe364a242b1e9993225758ea6e61369e363.tar.xz phpmyadmin-a490cfe364a242b1e9993225758ea6e61369e363.zip | |
reshapping of memcache container
Diffstat (limited to 'Services/mariadb')
| -rw-r--r-- | Services/mariadb/Dockerfile | 6 | ||||
| -rw-r--r-- | Services/mariadb/docker-compose.yml | 1 | ||||
| -rw-r--r-- | Services/mariadb/run.sh | 17 |
3 files changed, 4 insertions, 20 deletions
diff --git a/Services/mariadb/Dockerfile b/Services/mariadb/Dockerfile index 09a7acb..9679969 100644 --- a/Services/mariadb/Dockerfile +++ b/Services/mariadb/Dockerfile @@ -15,10 +15,8 @@ COPY my.cnf $MY_CONF COPY *.sql $LOADSQL_PATH/ RUN chmod 775 /bin/run.sh && \ chmod ug+r $MY_CONF && \ - mkdir /data && \ - mkdir /data/logs && \ - mkdir $DATA_PATH && \ - mkdir $LOG_PATH && \ + mkdir -p $DATA_PATH && \ + mkdir -p $LOG_PATH && \ touch $STARTUPLOG && \ touch $DATA_PATH/.keep && \ chown -R mysql:mysql $LOG_PATH $DATA_PATH $LOADSQL_PATH diff --git a/Services/mariadb/docker-compose.yml b/Services/mariadb/docker-compose.yml index f6a1143..744b067 100644 --- a/Services/mariadb/docker-compose.yml +++ b/Services/mariadb/docker-compose.yml @@ -10,7 +10,6 @@ server: CONTAINER_TYPE: "service" CONTAINER_SERVICE: "mariadb" CONTAINER_INSTANCE: "sx-mariadb" - SERVER_NAME: "localhost" MYSQL_ROOT_PASSWORD: "secretdemerde" MYSQL_USER: "user-test" MYSQL_PASSWORD: "pwd-test" diff --git a/Services/mariadb/run.sh b/Services/mariadb/run.sh index a2e4dfb..22f5f2a 100644 --- a/Services/mariadb/run.sh +++ b/Services/mariadb/run.sh @@ -3,22 +3,12 @@ source /bin/sx-lib.sh function check_mariadb_environment { check_environment - if [ ! -v SERVER_NAME ]; then - SERVER_NAME="localhost" - export SERVER_NAME - echo "! WARNING : environment var SERVER_NAME is missing..." - echo "! WARNING : auto-assigned value : $SERVER_NAME" - fi - if [ ! -v DOC_ROOT ]; then - DOC_ROOT="/data/apache" - export DOC_ROOT - fi if [ ! -v APP_PATH ]; then - APP_PATH="/data/apache" + APP_PATH="/data/mariadb" export APP_PATH fi if [ ! -v LOG_PATH ]; then - LOG_PATH="/data/logs/apache" + LOG_PATH="/data/logs/mariadb" export LOG_PATH fi } @@ -37,9 +27,6 @@ function display_container_mariadb_header { if [ -v CONTAINER_SERVICE ]; then echo "| Service : $CONTAINER_SERVICE" fi - if [ -v CONTAINER_SERVICE ]; then - echo "| ServerName : $SERVER_NAME" - fi if [ -v APP_PATH ]; then echo "| Data path : $DATA_PATH" fi |