Skip to content

Commit

Permalink
Compose update
Browse files Browse the repository at this point in the history
  • Loading branch information
mattbell87 committed Sep 30, 2024
1 parent 1ee9948 commit bc2ef5b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 11 deletions.
2 changes: 1 addition & 1 deletion dev.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/2pisoftware/cmfive:develop
FROM ghcr.io/2pisoftware/cmfive:pr-165

# Copy dev tools installer
COPY .codepipeline/docker/cmfive_dev_tools.sh .codepipeline/docker/cmfive_dev_tools.sh
Expand Down
18 changes: 8 additions & 10 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
services:
mysqldb:
cosine-db:
image: mysql:8
container_name: mysql-8
hostname: mysql-8
environment:
MYSQL_ROOT_PASSWORD: root
MYSQL_USER: cmfive
Expand All @@ -20,15 +18,15 @@ services:
timeout: 5m
retries: 20

webapp:
cosine:
build:
context: .
dockerfile: dev.dockerfile
container_name: cmfive
hostname: nginx-php8.1
container_name: cosine
hostname: cosine
environment:
TZ: Australia/Sydney
DB_HOST: mysqldb
DB_HOST: cosine-db
DB_DATABASE: cmfive
DB_USERNAME: cmfive
DB_PASSWORD: cmfive
Expand All @@ -46,9 +44,9 @@ services:
restart: unless-stopped
working_dir: /var/www/html
links:
- mysqldb
- cosine-db
depends_on:
mysqldb:
cosine-db:
condition: service_healthy
extra_hosts:
- "host.docker.internal:host-gateway"
Expand All @@ -71,7 +69,7 @@ services:
restart: unless-stopped
user: "1000:1000"
depends_on:
webapp:
cosine:
condition: service_healthy

volumes:
Expand Down

0 comments on commit bc2ef5b

Please sign in to comment.