diff --git a/README.md b/README.md index cd9dbc7..1b927dc 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ Joomla CMS. -1. Clone me -1. Change env -1. compose up -d \ No newline at end of file +1. Clone me ```git clone git@git.nickyeoman.com:nick/joomla.git projectName``` +1. mv env.sample .env +1. vi .env +1. sudo docker-compose up -d \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 8e08505..08aa773 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.8' volumes: - ${PROJECTNAME}-db: + joomla-db: joomla: networks: @@ -11,23 +11,21 @@ networks: services: mariadb: - container_name: ${PROJECTNAME}-db image: mariadb:10.7.1 # https://hub.docker.com/_/mariadb restart: always environment: MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD} - MYSQL_USER: joomlauser - MYSQL_PASSWORD: userpass - MYSQL_DATABASE: joomladb + MYSQL_USER: ${MYSQL_USER} + MYSQL_PASSWORD: ${MYSQL_PASSWORD} + MYSQL_DATABASE: ${MYSQL_DATABASE} volumes: - - ${PROJECTNAME}-db:/var/lib/mysql + - joomla-db:/var/lib/mysql joomla: - container_name: ${PROJECTNAME}-joomla image: joomla:4.3.1 # https://hub.docker.com/_/joomla restart: always environment: - JOOMLA_DB_HOST: ${PROJECTNAME}-db + JOOMLA_DB_HOST: mariadb JOOMLA_DB_USER: ${MYSQL_USER} JOOMLA_DB_PASSWORD: ${MYSQL_PASSWORD} JOOMLA_DB_NAME: ${MYSQL_DATABASE} @@ -37,19 +35,17 @@ services: - "8000:80" phpmyadmin: - container_name: ${PROJECTNAME}-phpmyadmin image: phpmyadmin/phpmyadmin:latest # https://hub.docker.com/_/phpmyadmin environment: PMA_USER: ${MYSQL_USER} PMA_PASSWORD: ${MYSQL_PASSWORD} - PMA_HOST: ${PROJECTNAME}-db + PMA_HOST: mariadb UPLOAD_LIMIT: '200M' ports: - "8001:80" mailhog: image: 'mailhog/mailhog:latest' # https://hub.docker.com/r/mailhog/mailhog - container_name: "${DOCKERNAME}-mailhog" ports: - "1025:1025" - "8025:8025" \ No newline at end of file diff --git a/env.sample b/env.sample index 0c5d0a9..1cc440c 100644 --- a/env.sample +++ b/env.sample @@ -1,6 +1,3 @@ -# Global -PROJECTNAME=joomla - # Docker NETWORKNAME=admin_web