Updating hopr-admin (#2)

* Updating hopr-admin

* Unifying pipelines

* Install docker-compose

* Add docker compose

* create docker file

* use different admin version

* modify in dockerfile

Author: ausias-armesto

.github/workflows/main.yml

@@ -4,13 +4,23 @@ on:
   pull_request:
   push:
     branches:
-      - main
+      - develop
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Set up Docker Compose
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y docker-compose
+
       - name: Build and upload to IPFS
         run: |
           npm install

.github/workflows/release.yml

@@ -3,14 +3,25 @@ name: Build (release package)
 on:
   push:
     branches:
-      - release
+      - main
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Set up Docker Compose
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y docker-compose
+
       - name: Build and publish to package repository
+        id: publish
         run: |
           npm install
           npx @dappnode/dappnodesdk publish patch \
@@ -21,6 +32,22 @@ jobs:
 
           echo "DNP (DAppNode Package) built and uploaded" >> $GITHUB_STEP_SUMMARY
           grep "ipfs" build.log >> $GITHUB_STEP_SUMMARY
+          ipfs_hash=$(grep -oP 'Release hash : \K/ipfs/\w+' build.log)
+          echo "ipfs_hash=$ipfs_hash" >> $GITHUB_OUTPUT
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           DEVELOPER_ADDRESS: "0x7305356ad936A06c4ea5DF45AD5E5C3ff9Db818E"
+
+      - name: Send message to Zulip
+        uses: zulip/github-actions-zulip/send-message@v1
+        with:
+          api-key: ${{ secrets.ZULIP_API_KEY }}
+          email: ${{ secrets.ZULIP_EMAIL }}
+          organization-url: "https://hopr.zulipchat.com"
+          type: "stream"
+          to: "Releases"
+          topic: "main"
+          content: |
+            A new hoprd dAppNode package (rotsee) version is available.
+            - IPFS Hash: ${{ steps.publish.outputs.ipfs_hash }}
+            Access to your dAppNode and check for the updates

docker-compose.yml

@@ -1,13 +1,14 @@
 version: "3.5"
 services:
   node:
+    # Do not set image field here, it will be set automatically by the sdk.
     build:
       context: .
       args:
         UPSTREAM_VERSION: >-
           2.1.0@sha256:28f5db3a37275edecb3b4d52f2d254832bf3346d9464a538c419575a40d8b744
     ports:
-      - "3101"
+      - "3101:3101/tcp"
       - 9191:9191/tcp
       - 9191:9191/udp
       - 9192:9192/tcp
@@ -27,13 +28,13 @@ services:
       - 9199:9199/tcp
       - 9199:9199/udp
     volumes:
-      - db:/app/hoprd-db
+      - "db:/app/hoprd-db"
     security_opt:
-      - seccomp:unconfined
+      - "seccomp:unconfined"
     environment:
       RUST_LOG: info
       HOPRD_CONFIGURATION_FILE_PATH: /app/hoprd.cfg.yaml
-      HOPRD_HOST: 127.0.0.1:9191
+      HOPRD_HOST: "127.0.0.1:9191"
       HOPRD_SAFE_ADDRESS: 0x
       HOPRD_MODULE_ADDRESS: 0x
       HOPRD_HEARTBEAT_THRESHOLD: 60
@@ -46,11 +47,15 @@ services:
       resources:
         limits:
           memory: 2G
-    image: node.hopr-testnet.public.dappnode.eth:1.0.0
   admin:
-    image: europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin:1.2.2
+    # The actual image name  will be set automatically by the sdk.
+    # This tag only serves to pull the correct image during build.
+    build:
+      context: ./hopr-admin
+    image: >-
+      europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin:2.1.6.1
     ports:
-      - "3100:80"
+      - "3100:4677"
     restart: unless-stopped
     deploy:
       resources:

hopr-admin/Dockerfile

@@ -0,0 +1,3 @@
+FROM europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin:2.1.6
+
+ENTRYPOINT ["nginx", "-g", "daemon off;"]