diff --git a/docker-compose.dcproj b/docker-compose.dcproj index baf34dea7..ff04b2d1c 100644 --- a/docker-compose.dcproj +++ b/docker-compose.dcproj @@ -10,7 +10,7 @@ - + \ No newline at end of file diff --git a/docker-compose.filterlists-api.yml b/docker-compose.filterlists-api.yml new file mode 100644 index 000000000..220ebe3bc --- /dev/null +++ b/docker-compose.filterlists-api.yml @@ -0,0 +1,36 @@ +version: "3.7" + +services: + app_filterlists-api: + image: collinbarrett/filterlists.api + build: + context: src + dockerfile: FilterLists.Api/Dockerfile + networks: + - filterlists-api + depends_on: + - mariadb_filterlists-api + + mariadb_filterlists-api: + image: mariadb:10 + networks: + - filterlists-api + volumes: + - filterlists-api_data:/var/lib/mysql + environment: + MYSQL_RANDOM_ROOT_PASSWORD: "yes" + MYSQL_DATABASE: filterlistsdata + MYSQL_USER: filterlists + MYSQL_PASSWORD: C53A28194242D82288E1E84A37E56D3EC7DFF83F1D9E018AF19E9BA27A5DF833 + command: + [ + "mysqld", + "--character-set-server=utf8mb4", + "--collation-server=utf8mb4_unicode_520_ci" + ] + +networks: + filterlists-api: + +volumes: + filterlists-api_data: diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 0a8eeb1a1..000000000 --- a/docker-compose.yml +++ /dev/null @@ -1,34 +0,0 @@ -version: "3.7" - -services: - - FilterLists.MariaDB: - image: mariadb:10 - environment: - MYSQL_RANDOM_ROOT_PASSWORD: "yes" - MYSQL_DATABASE: filterlistsdata - MYSQL_USER: filterlists - MYSQL_PASSWORD: C53A28194242D82288E1E84A37E56D3EC7DFF83F1D9E018AF19E9BA27A5DF833 - command: - [ - "mysqld", - "--character-set-server=utf8mb4", - "--collation-server=utf8mb4_unicode_520_ci", - ] - - FilterLists.Api: - image: "collinbarrett/filterlists.api" - build: - context: . - dockerfile: src/FilterLists.Api/Dockerfile - expose: - - "80/tcp" - depends_on: - - FilterLists.MariaDB - - FilterLists.Web: - image: "collinbarrett/filterlists.web" - build: - context: src/FilterLists.Web - expose: - - "80/tcp"