diff --git a/.gitea/workflows/deploy-develop.yml b/.gitea/workflows/deploy-develop.yml index 5681163..4d9af4c 100644 --- a/.gitea/workflows/deploy-develop.yml +++ b/.gitea/workflows/deploy-develop.yml @@ -8,49 +8,19 @@ on: jobs: build-and-deploy: runs-on: ubuntu-latest - steps: - name: Checkout code uses: actions/checkout@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to Gitea Container Registry - uses: docker/login-action@v2 - with: - registry: ${{ secrets.GITEA_REGISTRY }} - username: ${{ secrets.GITEA_USERNAME }} - password: ${{ secrets.GITEA_TOKEN }} - - - name: Build and push backend image - uses: docker/build-push-action@v4 - with: - context: ./backend - file: ./backend/Dockerfile - push: true - tags: ${{ secrets.GITEA_REGISTRY }}/${{ secrets.GITEA_USERNAME }}/lediscord-backend:develop - cache-from: type=registry,ref=${{ secrets.GITEA_REGISTRY }}/${{ secrets.GITEA_USERNAME }}/lediscord-backend:develop - cache-to: type=inline - - - name: Build and push frontend image - uses: docker/build-push-action@v4 - with: - context: ./frontend - file: ./frontend/Dockerfile - push: true - tags: ${{ secrets.GITEA_REGISTRY }}/${{ secrets.GITEA_USERNAME }}/lediscord-frontend:develop - cache-from: type=registry,ref=${{ secrets.GITEA_REGISTRY }}/${{ secrets.GITEA_USERNAME }}/lediscord-frontend:develop - cache-to: type=inline - - - name: Deploy to development server - uses: appleboy/ssh-action@v0.1.7 - with: - host: ${{ secrets.DEV_HOST }} - username: ${{ secrets.DEV_USERNAME }} - key: ${{ secrets.DEV_SSH_KEY }} - script: | - cd /path/to/lediscord - docker-compose pull - docker-compose up -d --build - docker-compose restart + + - name: Login to Gitea Registry + run: echo "${{ secrets.REGISTRY_TOKEN }}" | docker login ${{ secrets.REGISTRY_URL }} -u ${{ secrets.REGISTRY_USERNAME }} --password-stdin + + - name: Build and push backend + run: | + docker build -t ${{ secrets.REGISTRY_URL }}/${{ secrets.REGISTRY_USERNAME }}/lediscord-backend:develop ./backend + docker push ${{ secrets.REGISTRY_URL }}/${{ secrets.REGISTRY_USERNAME }}/lediscord-backend:develop + + - name: Build and push frontend + run: | + docker build -t ${{ secrets.REGISTRY_URL }}/${{ secrets.REGISTRY_USERNAME }}/lediscord-frontend:develop ./frontend + docker push ${{ secrets.REGISTRY_URL }}/${{ secrets.REGISTRY_USERNAME }}/lediscord-frontend:develop diff --git a/.gitea/workflows/deploy-prod.yml b/.gitea/workflows/deploy-prod.yml index 488328c..df86abf 100644 --- a/.gitea/workflows/deploy-prod.yml +++ b/.gitea/workflows/deploy-prod.yml @@ -80,9 +80,9 @@ jobs: - name: Login to Gitea Container Registry uses: docker/login-action@v2 with: - registry: ${{ secrets.GITEA_REGISTRY }} - username: ${{ secrets.GITEA_USERNAME }} - password: ${{ secrets.GITEA_TOKEN }} + registry: ${{ secrets.REGISTRY_URL }} + username: ${{ secrets.REGISTRY_USERNAME }} + password: ${{ secrets.REGISTRY_TOKEN }} - name: Build and push backend image uses: docker/build-push-action@v4 @@ -91,9 +91,9 @@ jobs: file: ./backend/Dockerfile push: true tags: | - ${{ secrets.GITEA_REGISTRY }}/${{ secrets.GITEA_USERNAME }}/lediscord-backend:prod - ${{ secrets.GITEA_REGISTRY }}/${{ secrets.GITEA_USERNAME }}/lediscord-backend:latest - cache-from: type=registry,ref=${{ secrets.GITEA_REGISTRY }}/${{ secrets.GITEA_USERNAME }}/lediscord-backend:prod + ${{ secrets.REGISTRY_URL }}/${{ secrets.REGISTRY_USERNAME }}/lediscord-backend:prod + ${{ secrets.REGISTRY_URL }}/${{ secrets.REGISTRY_USERNAME }}/lediscord-backend:latest + cache-from: type=registry,ref=${{ secrets.REGISTRY_URL }}/${{ secrets.REGISTRY_USERNAME }}/lediscord-backend:prod cache-to: type=inline - name: Build and push frontend image @@ -103,7 +103,7 @@ jobs: file: ./frontend/Dockerfile push: true tags: | - ${{ secrets.GITEA_REGISTRY }}/${{ secrets.GITEA_USERNAME }}/lediscord-frontend:prod - ${{ secrets.GITEA_REGISTRY }}/${{ secrets.GITEA_USERNAME }}/lediscord-frontend:latest - cache-from: type=registry,ref=${{ secrets.GITEA_REGISTRY }}/${{ secrets.GITEA_USERNAME }}/lediscord-frontend:prod + ${{ secrets.REGISTRY_URL }}/${{ secrets.REGISTRY_USERNAME }}/lediscord-frontend:prod + ${{ secrets.REGISTRY_URL }}/${{ secrets.REGISTRY_USERNAME }}/lediscord-frontend:latest + cache-from: type=registry,ref=${{ secrets.REGISTRY_URL }}/${{ secrets.REGISTRY_USERNAME }}/lediscord-frontend:prod cache-to: type=inline \ No newline at end of file