From 7631c971ab05fbc4fb11cbfb2e6bc74a52e47c8d Mon Sep 17 00:00:00 2001 From: Rushikesh Nimkar Date: Wed, 7 Aug 2024 19:44:26 +0530 Subject: [PATCH 01/10] dwifi status fix --- components/nodedataDwifi.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/nodedataDwifi.js b/components/nodedataDwifi.js index cc73743..fdfbec1 100644 --- a/components/nodedataDwifi.js +++ b/components/nodedataDwifi.js @@ -309,7 +309,7 @@ const NodeDwifiStream = () => {
- {item.connected == "true" ? "Offline" : "Online"} + {item.connected == "true" ? "Online" : "Offline"}
From 7fee0068a0857d5d80f6fcd3d94a09c758869609 Mon Sep 17 00:00:00 2001 From: Shubham Prajapati <89298156+p-shubh@users.noreply.github.com> Date: Wed, 7 Aug 2024 21:36:13 +0530 Subject: [PATCH 02/10] Create deploy-dev.yml --- .github/workflows/deploy/deploy-dev.yml | 57 +++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 .github/workflows/deploy/deploy-dev.yml diff --git a/.github/workflows/deploy/deploy-dev.yml b/.github/workflows/deploy/deploy-dev.yml new file mode 100644 index 0000000..6a6f726 --- /dev/null +++ b/.github/workflows/deploy/deploy-dev.yml @@ -0,0 +1,57 @@ +name: "Build and Push to GHCR" + +on: + push: + branches: + - main + +jobs: + build_push: + runs-on: ubuntu-latest + environment: dev + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Login to GitHub Container Registry + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: ${{ secrets.GHCR_USERNAME }} + password: ${{ secrets.GHCR_TOKEN }} + + - name: Build and Push Docker Image for Main + env: + DEV_ENV_FILE: ${{ env.DEV_EREBRUS_FRONTEND }} + run: | + echo "$DEV_EREBRUS_FRONTEND" > .env + export CURRENT_BRANCH=${GITHUB_REF#refs/heads/} + export TAG=$([[ $CURRENT_BRANCH == $(basename ${{ github.ref }}) ]] && echo $CURRENT_BRANCH || echo "latest") + echo $TAG + export GITHUB_REF_IMAGE=ghcr.io/$GITHUB_REPOSITORY:$GITHUB_SHA + export GITHUB_BRANCH_IMAGE=ghcr.io/$GITHUB_REPOSITORY:$TAG + export GITHUB_REF_IMAGE=$(echo $GITHUB_REF_IMAGE | tr '[:upper:]' '[:lower:]') + export GITHUB_BRANCH_IMAGE=$(echo $GITHUB_BRANCH_IMAGE | tr '[:upper:]' '[:lower:]') + docker build --build-arg version=$GITHUB_SHA -t $GITHUB_REF_IMAGE -t $GITHUB_BRANCH_IMAGE . + echo "Pushing Image to GitHub Container Registry" + docker push $GITHUB_REF_IMAGE + docker push $GITHUB_BRANCH_IMAGE + rm -rf .env + + deploy_dev: + needs: build_push + runs-on: self-hosted + steps: + - name: Deploy on DEV server + if: github.ref == 'refs/heads/main' + uses: appleboy/ssh-action@v0.1.7 + with: + host: ${{ secrets.DEV_REMOTE_SERVER_ADDRESS }} + username: ${{ secrets.DEV_SERVER_USERNAME }} + key: ${{ secrets.DEV_REMOTE_SERVER_KEY }} + port: ${{ secrets.DEV_SSH_PORT }} + script: | + docker stop erebrus-frontend || true && docker image rm ghcr.io/netsepio/erebrus-frontend:main + echo ${{ secrets.GHCR_TOKEN }} | docker login ghcr.io -u ${{ secrets.GHCR_USERNAME }} --password-stdin + docker pull ghcr.io/netsepio/erebrus-frontend:main + docker run --name="erebrus-frontend" --rm -p 4040:8080 --net=bridge -d ghcr.io/netsepio/erebrus-frontend:main From 7af7a9688dbaf9c53f45b17ed7a9846e539ed1ee Mon Sep 17 00:00:00 2001 From: Shubham Prajapati Date: Wed, 7 Aug 2024 21:37:48 +0530 Subject: [PATCH 03/10] updating deployment file --- .github/workflows/{deploy => }/deploy-dev.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{deploy => }/deploy-dev.yml (100%) diff --git a/.github/workflows/deploy/deploy-dev.yml b/.github/workflows/deploy-dev.yml similarity index 100% rename from .github/workflows/deploy/deploy-dev.yml rename to .github/workflows/deploy-dev.yml From 19920767afe86d32d352d028338f4f38bf9bac30 Mon Sep 17 00:00:00 2001 From: Shubham Prajapati <89298156+p-shubh@users.noreply.github.com> Date: Wed, 7 Aug 2024 21:48:38 +0530 Subject: [PATCH 04/10] Update deploy-dev.yml --- .github/workflows/deploy-dev.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 6a6f726..a1aba45 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -25,6 +25,7 @@ jobs: DEV_ENV_FILE: ${{ env.DEV_EREBRUS_FRONTEND }} run: | echo "$DEV_EREBRUS_FRONTEND" > .env + cat .env export CURRENT_BRANCH=${GITHUB_REF#refs/heads/} export TAG=$([[ $CURRENT_BRANCH == $(basename ${{ github.ref }}) ]] && echo $CURRENT_BRANCH || echo "latest") echo $TAG From 8ec631c8f1d920b471505566f4483af30a2e63f6 Mon Sep 17 00:00:00 2001 From: Shubham Prajapati <89298156+p-shubh@users.noreply.github.com> Date: Wed, 7 Aug 2024 21:53:17 +0530 Subject: [PATCH 05/10] Update deploy-dev.yml --- .github/workflows/deploy-dev.yml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index a1aba45..6ee55aa 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -13,6 +13,13 @@ jobs: - name: Checkout uses: actions/checkout@v3 + - name: Check DEV_EREBRUS_FRONTEND + run: | + if [ -z "${{ secrets.DEV_EREBRUS_FRONTEND }}" ]; then + echo "DEV_EREBRUS_FRONTEND is not set. Stopping the workflow." + exit 1 + fi + - name: Login to GitHub Container Registry uses: docker/login-action@v2 with: @@ -22,10 +29,9 @@ jobs: - name: Build and Push Docker Image for Main env: - DEV_ENV_FILE: ${{ env.DEV_EREBRUS_FRONTEND }} + DEV_ENV_FILE: ${{ secrets.DEV_EREBRUS_FRONTEND }} run: | echo "$DEV_EREBRUS_FRONTEND" > .env - cat .env export CURRENT_BRANCH=${GITHUB_REF#refs/heads/} export TAG=$([[ $CURRENT_BRANCH == $(basename ${{ github.ref }}) ]] && echo $CURRENT_BRANCH || echo "latest") echo $TAG @@ -48,11 +54,3 @@ jobs: uses: appleboy/ssh-action@v0.1.7 with: host: ${{ secrets.DEV_REMOTE_SERVER_ADDRESS }} - username: ${{ secrets.DEV_SERVER_USERNAME }} - key: ${{ secrets.DEV_REMOTE_SERVER_KEY }} - port: ${{ secrets.DEV_SSH_PORT }} - script: | - docker stop erebrus-frontend || true && docker image rm ghcr.io/netsepio/erebrus-frontend:main - echo ${{ secrets.GHCR_TOKEN }} | docker login ghcr.io -u ${{ secrets.GHCR_USERNAME }} --password-stdin - docker pull ghcr.io/netsepio/erebrus-frontend:main - docker run --name="erebrus-frontend" --rm -p 4040:8080 --net=bridge -d ghcr.io/netsepio/erebrus-frontend:main From d52ef27ad03b74d3284dec216bf09df0ae0077aa Mon Sep 17 00:00:00 2001 From: Shubham Prajapati <89298156+p-shubh@users.noreply.github.com> Date: Wed, 7 Aug 2024 21:56:34 +0530 Subject: [PATCH 06/10] Update deploy-dev.yml --- .github/workflows/deploy-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 6ee55aa..66b84dd 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -15,7 +15,7 @@ jobs: - name: Check DEV_EREBRUS_FRONTEND run: | - if [ -z "${{ secrets.DEV_EREBRUS_FRONTEND }}" ]; then + if [ -z "${{ env.DEV_EREBRUS_FRONTEND }}" ]; then echo "DEV_EREBRUS_FRONTEND is not set. Stopping the workflow." exit 1 fi From 9a000ad5a5cfccfd5d7b5c525cd13c02d0599eaa Mon Sep 17 00:00:00 2001 From: Shubham Prajapati <89298156+p-shubh@users.noreply.github.com> Date: Wed, 7 Aug 2024 22:01:43 +0530 Subject: [PATCH 07/10] Update deploy-dev.yml --- .github/workflows/deploy-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 66b84dd..3b3b7c1 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -15,7 +15,7 @@ jobs: - name: Check DEV_EREBRUS_FRONTEND run: | - if [ -z "${{ env.DEV_EREBRUS_FRONTEND }}" ]; then + if [ -z "${{ DEV_EREBRUS_FRONTEND }}" ]; then echo "DEV_EREBRUS_FRONTEND is not set. Stopping the workflow." exit 1 fi From 45a9e6169b642edebff58938ed19413ac57dd05c Mon Sep 17 00:00:00 2001 From: Shubham Prajapati <89298156+p-shubh@users.noreply.github.com> Date: Wed, 7 Aug 2024 22:02:18 +0530 Subject: [PATCH 08/10] Update deploy-dev.yml --- .github/workflows/deploy-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 3b3b7c1..12bb46b 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -15,7 +15,7 @@ jobs: - name: Check DEV_EREBRUS_FRONTEND run: | - if [ -z "${{ DEV_EREBRUS_FRONTEND }}" ]; then + if [ -z "$DEV_EREBRUS_FRONTEND" ]; then echo "DEV_EREBRUS_FRONTEND is not set. Stopping the workflow." exit 1 fi From f8271da54e81b742179c012657ecc40e5fe6ed88 Mon Sep 17 00:00:00 2001 From: Shubham Prajapati <89298156+p-shubh@users.noreply.github.com> Date: Wed, 7 Aug 2024 22:05:53 +0530 Subject: [PATCH 09/10] Update deploy-dev.yml --- .github/workflows/deploy-dev.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 12bb46b..cff00c6 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -13,13 +13,6 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Check DEV_EREBRUS_FRONTEND - run: | - if [ -z "$DEV_EREBRUS_FRONTEND" ]; then - echo "DEV_EREBRUS_FRONTEND is not set. Stopping the workflow." - exit 1 - fi - - name: Login to GitHub Container Registry uses: docker/login-action@v2 with: @@ -29,9 +22,10 @@ jobs: - name: Build and Push Docker Image for Main env: - DEV_ENV_FILE: ${{ secrets.DEV_EREBRUS_FRONTEND }} + DEV_ENV_FILE: ${{ vars.DEV_EREBRUS_FRONTEND }} run: | echo "$DEV_EREBRUS_FRONTEND" > .env + cat .env export CURRENT_BRANCH=${GITHUB_REF#refs/heads/} export TAG=$([[ $CURRENT_BRANCH == $(basename ${{ github.ref }}) ]] && echo $CURRENT_BRANCH || echo "latest") echo $TAG @@ -54,3 +48,11 @@ jobs: uses: appleboy/ssh-action@v0.1.7 with: host: ${{ secrets.DEV_REMOTE_SERVER_ADDRESS }} + username: ${{ secrets.DEV_SERVER_USERNAME }} + key: ${{ secrets.DEV_REMOTE_SERVER_KEY }} + port: ${{ secrets.DEV_SSH_PORT }} + script: | + docker stop erebrus-frontend || true && docker image rm ghcr.io/netsepio/erebrus-frontend:main + echo ${{ secrets.GHCR_TOKEN }} | docker login ghcr.io -u ${{ secrets.GHCR_USERNAME }} --password-stdin + docker pull ghcr.io/netsepio/erebrus-frontend:main + docker run --name="erebrus-frontend" --rm -p 4040:8080 --net=bridge -d ghcr.io/netsepio/erebrus-frontend:main From 1f93118645c2c513a131cb6c8bd4ce7d9cfad8a3 Mon Sep 17 00:00:00 2001 From: Shubham Prajapati <89298156+p-shubh@users.noreply.github.com> Date: Wed, 7 Aug 2024 22:21:06 +0530 Subject: [PATCH 10/10] Update deploy-dev.yml --- .github/workflows/deploy-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index cff00c6..a0ddec2 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -24,7 +24,7 @@ jobs: env: DEV_ENV_FILE: ${{ vars.DEV_EREBRUS_FRONTEND }} run: | - echo "$DEV_EREBRUS_FRONTEND" > .env + echo "$DEV_ENV_FILE" > .env cat .env export CURRENT_BRANCH=${GITHUB_REF#refs/heads/} export TAG=$([[ $CURRENT_BRANCH == $(basename ${{ github.ref }}) ]] && echo $CURRENT_BRANCH || echo "latest")