merge master into "reverse-boarding"

Author: louisinger

.github/workflows/ark.trivy.yaml

@@ -0,0 +1,35 @@
+name: Trivy Security Scan
+
+on:
+  push:
+    branches: ["master"]
+  pull_request:
+    branches: ["master"]
+
+jobs:
+  build:
+    name: Build and Scan
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Build an image from Dockerfile
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          load: true
+          tags: ${{ github.repository }}:${{ github.sha }}
+
+      - name: Run Trivy vulnerability scanner
+        uses: aquasecurity/[email protected]
+        with:
+          image-ref: "${{ github.repository }}:${{ github.sha }}"
+          format: "table"
+          exit-code: "1"
+          ignore-unfixed: true
+          vuln-type: "os,library"
+          severity: "CRITICAL,HIGH"

Dockerfile

@@ -14,7 +14,9 @@ RUN cd server && CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -l
 RUN cd client && CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -ldflags="-X 'main.Version=${VERSION}'" -o ../bin/ark .
 
 # Second image, running the arkd executable
-FROM alpine:3.12
+FROM alpine:3.18
+
+RUN apk update && apk upgrade
 
 WORKDIR /app
 
@@ -31,4 +33,3 @@ VOLUME /app/data
 VOLUME /app/wallet-data
 
 ENTRYPOINT [ "arkd" ]
-    

README.md

@@ -81,7 +81,7 @@ This will compile the `arkd` and `ark` binaries for your current architecture. F
 4. Install dependencies:
 
    ```sh
-   go mod download
+   go work sync
    ```
 
 5. Build the project:
@@ -97,7 +97,7 @@ Note: You need to run `make build` in both the `server` and `client` directories
 
 ## Support
 
-If you encounter any issues or have questions, please file an issue on our [GitHub Issues](https://github.com/ark-network/ark/issues) page. 
+If you encounter any issues or have questions, please file an issue on our [GitHub Issues](https://github.com/ark-network/ark/issues) page.
 
 ## Security