Skip to content

Commit

Permalink
fixed, now working
Browse files Browse the repository at this point in the history
  • Loading branch information
foozleface committed Jan 24, 2025
1 parent cdb7b60 commit c4fb011
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 4,429 deletions.
2 changes: 1 addition & 1 deletion app/views/layouts/application.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
%link{href: "https://fonts.googleapis.com/css?family=Montserrat", rel: "stylesheet"}
%link{href: "https://fonts.googleapis.com/css?family=Raleway", rel: "stylesheet"}
=javascript_pack_tag 'hotwire_app'
=javascript_importmap_tags
=stylesheet_link_tag 'tailwind', 'inter-font'
=stylesheet_link_tag 'application'
Expand Down
55 changes: 32 additions & 23 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,38 +1,47 @@
version: "3"

version: "3.9"
services:
db:
image: mysql/mysql-server:latest
environment:
- MYSQL_ROOT_HOST=%
- MYSQL_ROOT_PASSWORD=password
ports:
- "3306:3306" # Expose port for external access
expose:
- "3306" # Internal access within the Docker network
container_name: antcat-db
volumes:
- ./sql-data:/docker-entrypoint-initdb.d
networks:
- antcat-network

app:
depends_on:
- db
build:
context: .
dockerfile: Dockerfile.dev
dockerfile: Dockerfile
environment:
DB_USERNAME: root
DB_DATABASE: antcat_docker
DB_PASSWORD: password
DB_DATABASE: antcat
DB_PORT: 3306
DB_HOST: db
DB_HOST: db # Use service name for DNS resolution
NO_DEV_MONKEY_PATCHES: "y"
volumes:
- .:/app
- ./docker_dev/database.docker-dev.yml:/app/config/database.yml
- ./config/server.yml.example:/app/config/server.yml
- ..:/app
- ./database.yml:/app/config/database.yml
- ../config/server.yml.example:/app/config/server.yml
ports:
- "8080:8080"
container_name: antcat-app
user: antcat
stdin_open: true
tty: true
container_name: antcat_app


db:
image: mysql:5.7
expose:
- "3306"
ports:
- "3309:3306"
environment:
MYSQL_ALLOW_EMPTY_PASSWORD: "true"
volumes:
- mysql:/var/lib/mysql
command: ["/bin/bash", "-c", "app/startup.sh"]
networks:
- antcat-network

volumes:
mysql:
networks:
antcat-network:
driver: bridge
2 changes: 1 addition & 1 deletion dockerized_app/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ services:
user: antcat
stdin_open: true
tty: true
command: ["/bin/bash", "-c", "app/startup.sh"]
command: ["/bin/bash", "-c", "dockerized_app/startup.sh"]
networks:
- antcat-network

Expand Down
Loading

0 comments on commit c4fb011

Please sign in to comment.