diff --git a/docker/dev-compose.yml b/docker/dev-compose.yml index 1411808f3..557d396e4 100644 --- a/docker/dev-compose.yml +++ b/docker/dev-compose.yml @@ -10,7 +10,7 @@ networks: services: db: container_name: db - image: postgres:latest + image: postgres:14 restart: always volumes: - database-data:/var/lib/postgresql/data/ @@ -25,11 +25,16 @@ services: app: build: context: ../ - dockerfile: docker/Dockerfile + dockerfile: ./docker/Dockerfile ports: - - 3000:3000 + - 3030:3030 depends_on: - db - env_file: .env + environment: + DATABASE_URL: postgres://postgres:postgres@db:5432/postgres?schema=public + SESSION_SECRET: secret123 + MAGIC_LINK_SECRET: secret123 + REMIX_APP_PORT: 3030 + PORT: 3030 networks: - app_network diff --git a/package.json b/package.json index d635cf386..ac21fd407 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,8 @@ "lint": "turbo run lint", "docker": "docker-compose -p triggerdotdev-docker -f docker/docker-compose.yml up -d", "docker:stop": "docker-compose -p triggerdotdev-docker -f docker/docker-compose.yml stop", + "dev:docker": "docker-compose -p triggerdotdev-dev-docker -f docker/dev-compose.yml up -d", + "dev:docker:stop": "docker-compose -p triggerdotdev-dev-docker -f docker/dev-compose.yml stop", "test": "turbo run test", "test:dev": "turbo run test:dev", "start": "turbo run start",