From 18d7f1b3397bbc4b0bcf4a836d5e731cc4ff3a76 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 28 Apr 2025 11:51:20 -0700 Subject: [PATCH 1/3] add distribution workflow --- .github/workflows/distribution-deploy.yml | 77 +++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 .github/workflows/distribution-deploy.yml diff --git a/.github/workflows/distribution-deploy.yml b/.github/workflows/distribution-deploy.yml new file mode 100644 index 000000000..7f582d94b --- /dev/null +++ b/.github/workflows/distribution-deploy.yml @@ -0,0 +1,77 @@ +name: Demo deploy + +on: + push: + branches: ["demo"] + workflow_dispatch: +jobs: + docker-build-and-push-client: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Log in to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Build Client Docker image + run: | + docker build \ + -t ghcr.io/bluewave-labs/checkmate:frontend-dist \ + -f ./docker/dist/client.Dockerfile \ + --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \ + . + + - name: Push Client Docker image + run: docker push ghcr.io/bluewave-labs/checkmate:frontend-dist + + docker-build-and-push-server: + needs: docker-build-and-push-client + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Log in to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Build Server Docker image + run: | + docker build \ + -t ghcr.io/bluewave-labs/checkmate:backend-dist \ + -f ./docker/dist/server.Dockerfile \ + --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \ + . + + - name: Push Server Docker image + run: docker push ghcr.io/bluewave-labs/checkmate:backend-dist + + - name: Build Mongo Docker image + run: | + docker build \ + -t ghcr.io/bluewave-labs/checkmate:mongo-dist \ + -f ./docker/dist/mongoDB.Dockerfile \ + --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \ + . + + - name: Push MongoDB Docker image + run: docker push ghcr.io/bluewave-labs/checkmate:mongo-dist + + - name: Build Redis Docker image + run: | + docker build \ + -t ghcr.io/bluewave-labs/checkmate:redis-dist \ + -f ./docker/dist/redis.Dockerfile \ + --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \ + . + + - name: Push Redis Docker image + run: docker push ghcr.io/bluewave-labs/checkmate:redis-dist From 62db71b4d9730f19af0d9bef941b7ed02fc0eaf2 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 28 Apr 2025 11:51:37 -0700 Subject: [PATCH 2/3] update docker compose --- docker/dist/docker-compose.yaml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/docker/dist/docker-compose.yaml b/docker/dist/docker-compose.yaml index 035139226..051f8ae25 100755 --- a/docker/dist/docker-compose.yaml +++ b/docker/dist/docker-compose.yaml @@ -1,6 +1,6 @@ services: client: - image: bluewaveuptime/uptime_client:latest + image: ghcr.io/bluewave-labs/checkmate:frontend-dist restart: always environment: UPTIME_APP_API_BASE_URL: "http://localhost:5000/api/v1" @@ -10,7 +10,7 @@ services: depends_on: - server server: - image: bluewaveuptime/uptime_server:latest + image: ghcr.io/bluewave-labs/checkmate:backend-dist restart: always ports: - "5000:5000" @@ -18,8 +18,8 @@ services: - redis - mongodb environment: - - DB_CONNECTION_STRING=mongodb://mongodb:27017/uptime_db - - REDIS_URL=redis://redis:6379 + - DB_CONNECTION_STRING=mongodb://localhost:27017/uptime_db?replicaSet=rs0 + - REDIS_URL="redis://redis:6379" - CLIENT_HOST=http://localhost # volumes: # - /var/run/docker.sock:/var/run/docker.sock:ro @@ -44,3 +44,10 @@ services: command: ["mongod", "--quiet"] ports: - "27017:27017" + healthcheck: + test: echo "try { rs.status() } catch (err) { rs.initiate({_id:'rs0',members:[{_id:0,host:'mongodb:27017'}]}) }" | mongosh --port 27017 --quiet + interval: 5s + timeout: 30s + start_period: 0s + start_interval: 1s + retries: 30 From f790930872bf38992b8cfc360319b8f702b10362 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 28 Apr 2025 11:52:17 -0700 Subject: [PATCH 3/3] fix branch name --- .github/workflows/distribution-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/distribution-deploy.yml b/.github/workflows/distribution-deploy.yml index 7f582d94b..92065cd1e 100644 --- a/.github/workflows/distribution-deploy.yml +++ b/.github/workflows/distribution-deploy.yml @@ -2,7 +2,7 @@ name: Demo deploy on: push: - branches: ["demo"] + branches: ["master"] workflow_dispatch: jobs: docker-build-and-push-client: