Skip to content

Commit

Permalink
Merge pull request #191 from seanmorley15/development
Browse files Browse the repository at this point in the history
fix dockerfile
  • Loading branch information
seanmorley15 authored Aug 15, 2024
2 parents 54ff856 + 9a7d85d commit 83e907a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ version: "3.9"

services:
web:
build: ./frontend/
#image: ghcr.io/seanmorley15/adventurelog-frontend:latest
#build: ./frontend/
image: ghcr.io/seanmorley15/adventurelog-frontend:latest
environment:
- PUBLIC_SERVER_URL=http://server:8000
- ORIGIN=http://localhost:8080
Expand All @@ -23,8 +23,8 @@ services:
- postgres_data:/var/lib/postgresql/data/

server:
build: ./backend/
#image: ghcr.io/seanmorley15/adventurelog-backend:latest
#build: ./backend/
image: ghcr.io/seanmorley15/adventurelog-backend:latest
environment:
- PGHOST=db
- PGDATABASE=database
Expand Down
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "adventurelog-frontend",
"version": "0.5.0",
"version": "0.5.1",
"scripts": {
"dev": "vite dev",
"django": "cd .. && cd backend/server && python3 manage.py runserver",
Expand Down

0 comments on commit 83e907a

Please sign in to comment.