diff --git a/deploy/Dockerfile.nginx b/deploy/Dockerfile.nginx new file mode 100644 index 0000000..6e8acef --- /dev/null +++ b/deploy/Dockerfile.nginx @@ -0,0 +1,2 @@ +FROM nginx:alpine +COPY . /usr/share/nginx/html diff --git a/deploy/README.md b/deploy/README.md index ea235c7..a4db91b 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -5,7 +5,7 @@ ```bash git clone https://gitea.ledrew.me/ledadmin/project-tracker.git cd project-tracker/deploy -docker compose up -d +docker compose up -d --build ``` App available at `http://` @@ -45,11 +45,12 @@ console.log('Seeded', items.length, 'projects'); ## Commands ```bash -docker compose up -d # Start -docker compose logs -f # View logs -docker compose restart # Restart -docker compose down # Stop -docker compose down -v # Stop and DELETE database volume (CAREFUL!) +docker compose up -d --build # Build and start (always use --build to pick up code changes) +docker compose logs -f # View logs +docker compose logs -f backend # View backend logs only +docker compose restart # Restart +docker compose down # Stop +docker compose down -v # Stop and DELETE database volume (CAREFUL!) docker exec -it project-tracker-api sh # Shell into backend container ``` @@ -85,11 +86,9 @@ docker exec -it project-tracker-api sh # Shell into backend container ## Updating ```bash -cd project-tracker git pull docker compose down -docker compose build --no-cache -docker compose up -d +docker compose up -d --build ``` --- diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index 7beef52..38a03c5 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -1,8 +1,8 @@ services: backend: build: - context: . - dockerfile: Dockerfile + context: ../backend + dockerfile: ../deploy/Dockerfile container_name: project-tracker-api restart: unless-stopped volumes: @@ -14,14 +14,13 @@ services: - project-tracker-net nginx: - image: nginx:alpine + build: + context: ../frontend + dockerfile: ../deploy/Dockerfile.nginx container_name: project-tracker-nginx restart: unless-stopped ports: - "80:80" - volumes: - - ./nginx.conf:/etc/nginx/conf.d/default.conf:ro - - ../frontend:/usr/share/nginx/html:ro depends_on: - backend networks: diff --git a/frontend/index.html b/frontend/index.html index d549c7a..418c3e2 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -478,7 +478,7 @@