Merge main branch and resolve Dockerfile conflicts

- Keep jose package installation from main branch
- Preserve our fixed user/group deletion logic for Docker build
- Resolve merge conflicts maintaining both improvements

Signed-off-by: Kallal Mukherjee <ritamukherje62@gmail.com>

Author: kallal79

.github/workflows/ci-go-cover.yml

@@ -26,7 +26,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v3
       with:
-        go-version: "1.22"
+        go-version: "1.24"
     - name: Checkout code
       uses: actions/checkout@v2
     - name: Install mockgen

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v3
       with:
-        go-version: "1.22"
+        go-version: "1.24"
     - name: Checkout code
       uses: actions/checkout@v2
     - name: Install mockgen

.github/workflows/linters.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v3
       with:
-        go-version: "1.22"
+        go-version: "1.24"
     - name: Checkout code
       uses: actions/checkout@v2
     - name: Install mockgen
@@ -24,8 +24,7 @@ jobs:
         go install golang.org/x/tools/cmd/guru@latest
     - name: Install golangci-lint
       run: |
-        go version
-        curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.54.2
+        go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
     - name: Install Protoc
       uses: arduino/setup-protoc@v1
       with:

.github/workflows/time-package.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: "1.22"
+          go-version: "1.24"
           cache: false
       - name: Checkout code
         uses: actions/checkout@v4
@@ -48,10 +48,6 @@ jobs:
         uses: ConorMacBride/install-package@v1
         with:
           apt: openssl sqlite3 gettext findutils jq
-      - name: Install step-cli
-        run: |
-          wget https://dl.smallstep.com/cli/docs-cli-install/latest/step-cli_amd64.deb -O /tmp/step-cli_amd64.deb
-          sudo dpkg -i /tmp/step-cli_amd64.deb
       - name: create deb
         run: |
           mkdir /tmp/veraison-package

Makefile

@@ -1,4 +1,4 @@
-# Copyright 2021-2024 Contributors to the Veraison project.
+# Copyright 2021-2025 Contributors to the Veraison project.
 # SPDX-License-Identifier: Apache-2.0
 
 export TOPDIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
@@ -113,7 +113,6 @@ endif
 really-clean:
 	make -C integration-tests really-clean
 	make -C deployments/debian really-clean
-	make -C deployments/rpm really-clean
 	make -C deployments/docker really-clean
 	make -C deployments/native really-clean
 

README.md

@@ -84,7 +84,7 @@ system (on MacOS, they should be available via brew).
 Veraison will be deployed into the directory specified by `VERAISON_ROOT`
 environment variable (or into `${HOME}/veraison-deployment` if it is not set).
 
-    export VERAISON_ROOT=${HOME}/veraison-deployment
+    export VERAISON_ROOT=${HOME}/veraison-deployment/
 
 You can build, deploy, and start Veraison services with the following sequence
 of commands:

deployments/debian/README.md

@@ -35,7 +35,7 @@ make deb
 This will create
 `${PACKAGE_DEST}/veraison_deb_package/veraison_VERSION_ARCH.deb`, where `VERSION`
 is the Veraison version as reported by the
-[`get-veraison-version`](../scripts/get-veraison-version) script, and `ARCH` is
+[`get-veraison-version`](../../scripts/get-veraison-version) script, and `ARCH` is
 the architecture of your system as reported by `dpkg --print-architecture`.
 
 Alongside the package, there will be a subdirectory with the same name but

deployments/debian/debian/control.template

@@ -1,4 +1,4 @@
-Package: veraison
+Package: veraison-services
 Version: ${_VERAISON_VERSION}
 Maintainer: Veraison Project <veraison-project@confidentialcomputing.io>
 Architecture: amd64

deployments/debian/deployment.sh

@@ -54,7 +54,7 @@ function create_deb() {
 	set +a
 
 	export VERAISON_ROOT=/opt/veraison
-	export DEPLOYMENT_DEST=${pkg_dir}${VERAISON_ROOT}
+	export DEPLOYMENT_DEST=${pkg_dir}
 	export VTS_HOST=$VERAISON_HOST
 	export PROVISIONING_HOST=$VERAISON_HOST
 	export VERIFICATION_HOST=$VERAISON_HOST

deployments/docker/README.md

@@ -11,13 +11,13 @@ would also need to be installed.
 
 ```sh
 # on Ubuntu
-sudo apt install bash make git docker.io docker-buildx jq tmux
+sudo apt install bash make git docker.io docker-buildx jq tmux jose
 
 # on Arch
-sudo pacman -S bash make git docker docker-buildx jq tmux
+sudo pacman -S bash make git docker docker-buildx jq tmux jose
 
 # On MacOSX with Homebrew
-brew install step coreutils gettext openssl sqlite3 protobuf jq
+brew install jose coreutils gettext openssl sqlite3 protobuf jq
 brew link --force gettext
 ```