Skip to content

Commit

Permalink
Merge branch 'develop' into backend_usermanagement
Browse files Browse the repository at this point in the history
  • Loading branch information
xinnie-ca committed Mar 11, 2024
2 parents c3b3eec + 0618925 commit 8b2b649
Show file tree
Hide file tree
Showing 10 changed files with 400 additions and 199 deletions.
89 changes: 0 additions & 89 deletions .github/workflows/DjangoDeployment.yml

This file was deleted.

70 changes: 0 additions & 70 deletions .github/workflows/ReactDeployment.yml

This file was deleted.

32 changes: 32 additions & 0 deletions .github/workflows/docker-hub.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Release to Docker Hub

on:
push:
branches:
- "master"
pull_request:
branches:
- "master"

jobs:
build:
runs-on: ubuntu-latest
steps:
-
name: Checkout
uses: actions/checkout@v4
-
name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
-
name: Build Docker image
run: docker-compose up --build -d
-
name: Push Docker image to Docker Hub
run: docker-compose push
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ services:
- POSTGRES_PASSWORD=postgres

backend:
image: verzaccii/lvlupgg-backend
build:
context: ./lvlgg_backend
dockerfile: Dockerfile.backend
Expand All @@ -36,6 +37,7 @@ services:
- "5050:80"

frontend:
image: verzaccii/lvlupgg-frontend
build:
context: ./lvlgg_frontend
dockerfile: Dockerfile.frontend
Expand Down
Loading

0 comments on commit 8b2b649

Please sign in to comment.