Merge branch 'main' into adjust-client-connection-limit

Author: Echsecutor

.github/workflows/build-all.yml

@@ -17,7 +17,7 @@ jobs:
       pull-requests: read
     outputs:
       repo_owner: ${{ steps.repo_owner.outputs.lowercase }}
-      os_matrix: "{\"os_version\":[\"debian10\",\"debian11\",\"ubuntu16\",\"ubuntu18\",\"ubuntu20\"]}"
+      os_matrix: "{\"os_version\":[\"debian11\",\"ubuntu20\"]}"
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4

.github/workflows/trivy-all.yml

@@ -25,7 +25,7 @@ jobs:
     needs: workflow_setup
     strategy:
       matrix:
-        os_version: [ debian10, debian11, ubuntu16, ubuntu18, ubuntu20 ]
+        os_version: [ debian11, ubuntu20 ]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

Makefile

@@ -13,22 +13,13 @@
 #   limitations under the License.
 
 
-# The default make goal is ubuntu18  
-.DEFAULT_GOAL := ubuntu18
+# The default make goal is ubuntu20
+.DEFAULT_GOAL := ubuntu20
 
-all: bullseye buster ubuntu16 ubuntu18 ubuntu20 controller
+all: bullseye ubuntu20 controller
 
 bullseye:
-	docker build -f "build/Dockerfile.bullseye" -t indy-node-container/indy_node:bullseye ./build
-
-buster:
-	docker build -f "build/Dockerfile.buster" -t indy-node-container/indy_node:buster ./build
-
-ubuntu16:
-	docker build -f "build/Dockerfile.ubuntu16" -t indy-node-container/indy_node:ubuntu16 ./build
-
-ubuntu18:
-	docker build -f "build/Dockerfile.ubuntu18" -t indy-node-container/indy_node:ubuntu18 ./build
+	docker build -f "build/Dockerfile.debian11" -t indy-node-container/indy_node:bullseye ./build
 
 ubuntu20:
 	docker build -f "build/Dockerfile.ubuntu20" -t indy-node-container/indy_node:ubuntu20 ./build
@@ -40,22 +31,13 @@ controller:
 clean_bullseye:
 	-docker image rm indy-node-container/indy_node:bullseye
 
-clean_buster:
-	-docker image rm indy-node-container/indy_node:buster
-
-clean_ubuntu16:
-	-docker image rm indy-node-container/indy_node:ubuntu16
-
-clean_ubuntu18:
-	-docker image rm indy-node-container/indy_node:ubuntu18
-
 clean_ubuntu20:
 	-docker image rm indy-node-container/indy_node:ubuntu20
 
 clean_controller:
 	-docker image rm indy-node-container/indy_node_controller
 
-clean: clean_bullseye clean_buster clean_ubuntu16 clean_ubuntu18 clean_ubuntu20 clean_controller
+clean: clean_bullseye clean_ubuntu20 clean_controller
 
 
 # all check targets require a local trivy installation - see https://aquasecurity.github.io/trivy/
@@ -66,24 +48,6 @@ check_bullseye:
 #	-xdg-open trivy-reports/bullseye.html
 	-trivy image --ignore-unfixed --severity HIGH,CRITICAL indy-node-container/indy_node:bullseye
 
-check_buster:
-	mkdir -p trivy-reports
-	-trivy image --ignore-unfixed --severity HIGH,CRITICAL --format template --template "@trivy/html.tpl" -o trivy-reports/buster.html indy-node-container/indy_node:buster
-#	-xdg-open trivy-reports/buster.html
-	-trivy image --ignore-unfixed --severity HIGH,CRITICAL indy-node-container/indy_node:buster
-
-check_ubuntu16:
-	mkdir -p trivy-reports
-	-trivy image --ignore-unfixed --severity HIGH,CRITICAL --format template --template "@trivy/html.tpl" -o trivy-reports/ubuntu16.html indy-node-container/indy_node:ubuntu16
-#	-xdg-open trivy-reports/ubuntu16.html
-	-trivy image --ignore-unfixed --severity HIGH,CRITICAL indy-node-container/indy_node:ubuntu16
-
-check_ubuntu18:
-	mkdir -p trivy-reports
-	-trivy image --ignore-unfixed --severity HIGH,CRITICAL --format template --template "@trivy/html.tpl" -o trivy-reports/ubuntu18.html indy-node-container/indy_node:ubuntu18
-#	-xdg-open trivy-reports/ubuntu18.html
-	-trivy image --ignore-unfixed --severity HIGH,CRITICAL indy-node-container/indy_node:ubuntu18
-
 check_ubuntu20:
 	mkdir -p trivy-reports
 	-trivy image --ignore-unfixed --severity HIGH,CRITICAL --format template --template "@trivy/html.tpl" -o trivy-reports/ubuntu20.html indy-node-container/indy_node:ubuntu20

README.md

@@ -17,11 +17,6 @@ See [here](run/) for instructions how to setup and run the indy node images from
 
 Currently we are providing the following stable indy node images. All those images use the latest Indy Node 1.12 version. The images differ by base image and are tagged accordingly:
 
-- [Ubuntu 16](https://github.com/hyperledger/indy-node-container/pkgs/container/indy-node-container%2Findy_node/39147763?tag=latest-ubuntu16) :warning: 
-    - This image is **deprecated**. We will soon remove the image build from the CD pipeline. Please change to one of the other stable images.
-- [Ubuntu 18](https://github.com/hyperledger/indy-node-container/pkgs/container/indy-node-container%2Findy_node/39147763?tag=latest-ubuntu18)
-- [Debian Buster 10](https://github.com/hyperledger/indy-node-container/pkgs/container/indy-node-container%2Findy_node/37273284?tag=latest-buster) :warning: 
-    - :warning: This image is **deprecated.** We will soon remove the image build from the CD pipeline. Please change to one of the other stable images.
 - [Debian Bullseye 11](https://github.com/hyperledger/indy-node-container/pkgs/container/indy-node-container%2Findy_node/37273284?tag=latest-bullseye)
 
 Additionally, we build an experimental image for Indy node 1.13 RC testing:
@@ -35,17 +30,17 @@ See [here](run/) for instructions how to setup and run the images.
 To build the node image you can use `docker` from the project root like
 
 ```bash
-docker build -f "build/Dockerfile.ubuntu18" -t indy-node-container/indy_node:ubuntu18 ./build
+docker build -f "build/Dockerfile.ubuntu20" -t indy-node-container/indy_node:ubuntu20 ./build
 ```
 
 or you can use `make` which provides some shortcuts
 
 ```bash
-# make [bullseye|buster|ubuntu16|ubuntu18|ubuntu20|all|controller] (default is ubuntu18), e.g.
-make ubuntu18
+# make [bullseye|ubuntu20|all|controller] (default is ubuntu20), e.g.
+make ubuntu20
 
 # make clean removes images
-# make [clean|clean_bullseye|clean_buster|clean_ubuntu16|clean_ubuntu18|clean_ubuntu20|clean_controller], e.g. this removes all images
+# make [clean|clean_bullseye|clean_ubuntu20|clean_controller], e.g. this removes all images
 make clean
 ```
 
@@ -54,8 +49,8 @@ Please note that `make` generates different tags than the Github action (see [pa
 If you have [trivy](https://aquasecurity.github.io/trivy) installed, you can use the make check_* targets to run a trivy check against the local images:
 
 ```bash
-#make [check_bullseye|check_buster|check_ubuntu16|check_ubuntu18|check_ubuntu20|check_controller], e.g.
-make check_ubuntu18
+#make [check_bullseye|check_ubuntu20|check_controller], e.g.
+make check_ubuntu20
 ```
 
 Trivy HTML reports are created in `./trivy-reports`.

build/Dockerfile.debian10

@@ -3,7 +3,7 @@ INDY_NETWORK_NAME=ssi4de
 INDY_NODE_NAME=GS1Germany
 
 # Choose one of the avaiable images
-IMAGE=ghcr.io/hyperledger/indy-node-container/indy_node:latest-ubuntu18
+IMAGE=ghcr.io/hyperledger/indy-node-container/indy_node:latest-ubuntu20
 
 # You likely want to keep these default values:
 SOCK=/var/run/docker.sock

build/Dockerfile.ubuntu16

@@ -172,6 +172,6 @@ Our current approach to handle pool restarts is to have the node controller runn
 
 If wou want to use the node controller, the variables `SOCK`, `NODE_CONTAINER_NAME`, `CONTROLLER_CONTAINER`, and `IMAGE_NAME_CONTROLLER` need to be set in the `.env` file. Appropriate default values are set in [the default file](/.env).
 
-If the node controller container is running and has access to the docker socket of the host, the node will be restarted upon pool restart commands and will participate in a network upgrade. The decision mechanism for whether to accept or reject an upgrade based on available deb package versions is part of indy node server and hence unchanged. However, if an upgrade is accepted, the container will be stopped, pulled, and restarted. Use a tag like `latest-ubuntu18` and make sure that a new `latest` image is available before the network upgrade commences.
+If the node controller container is running and has access to the docker socket of the host, the node will be restarted upon pool restart commands and will participate in a network upgrade. The decision mechanism for whether to accept or reject an upgrade based on available deb package versions is part of indy node server and hence unchanged. However, if an upgrade is accepted, the container will be stopped, pulled, and restarted. Use a tag like `latest-ubuntu20` and make sure that a new `latest` image is available before the network upgrade commences.
 
 

build/Dockerfile.ubuntu18

@@ -1,7 +1,7 @@
 INDY_NETWORK_NAME=idunion_local_test
-IMAGE_NAME_NODE=ghcr.io/hyperledger/indy-node-container/indy_node:latest-buster
+IMAGE_NAME_NODE=ghcr.io/hyperledger/indy-node-container/indy_node:latest-bookworm
 IMAGE_NAME_CONTROLLER=ghcr.io/hyperledger/indy-node-container/indy_node_controller
-REFERENCE_IMAGE_NAME_NODE=ghcr.io/hyperledger/indy-node-container/indy_node:latest-ubuntu16
+REFERENCE_IMAGE_NAME_NODE=ghcr.io/hyperledger/indy-node-container/indy_node:latest-ubuntu20
 
 INDY_NODE_IP_1=0.0.0.0
 INDY_NODE_PORT_1=9701