Update README, small fix for trivy html template

Signed-off-by: Guido Wischrop <Guido.Wischrop@mgm-tp.com>
Signed-off-by: mgmgwi <43027257+mgmgwi@users.noreply.github.com>

Author: mgmgwi

Makefile

@@ -1,19 +1,41 @@
-all: bullseye buster ubuntu16 ubuntu18 ubuntu20
+# Copyright 2020-2021 by all parties listed in the NOTICE file
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+
+# The default make goal is ubuntu18  
+.DEFAULT_GOAL := ubuntu18
+
+all: bullseye buster ubuntu16 ubuntu18 ubuntu20 controller
 
 bullseye:
-	docker build -f "build/Dockerfile.bullseye" -t indy-node-container/indy_node:bullseye build
+	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
+	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
+	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.ubuntu18" -t indy-node-container/indy_node:ubuntu18 ./build
 
 ubuntu20:
-	docker build -f "build/Dockerfile.ubuntu20" -t indy-node-container/indy_node:ubuntu20 build
+	docker build -f "build/Dockerfile.ubuntu20" -t indy-node-container/indy_node:ubuntu20 ./build
+
+.PHONY: controller
+controller:
+	docker build controller -t indy-node-container/indy_node_controller
 
 clean_bullseye:
 	-docker image rm indy-node-container/indy_node:bullseye
@@ -30,7 +52,10 @@ clean_ubuntu18:
 clean_ubuntu20:
 	-docker image rm indy-node-container/indy_node:ubuntu20
 
-clean: clean_bullseye clean_buster clean_ubuntu16 clean_ubuntu18 clean_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
 
 
 # all check targets require a local trivy installation - see https://aquasecurity.github.io/trivy/
@@ -64,3 +89,9 @@ check_ubuntu20:
 	-trivy image --ignore-unfixed --severity HIGH,CRITICAL --format template --template "@trivy/html.tpl" -o trivy-reports/ubuntu20.html indy-node-container/indy_node:ubuntu20
 #	-xdg-open trivy-reports/ubuntu20.html
 	-trivy image --ignore-unfixed --severity HIGH,CRITICAL indy-node-container/indy_node:ubuntu20
+
+check_controller:
+	mkdir -p trivy-reports
+	-trivy image --ignore-unfixed --severity HIGH,CRITICAL --format template --template "@trivy/html.tpl" -o trivy-reports/node_controller.html indy-node-container/indy_node_controller
+#	-xdg-open trivy-reports/node_controller.html
+	-trivy image --ignore-unfixed --severity HIGH,CRITICAL indy-node-container/indy_node_controller

NOTICE

@@ -33,3 +33,5 @@
 - Robin Klemens <klemens@internet-sicherheit.de>
 - Cristian Kubis <kubis@internet-sicherheit.de>
 
+ mgm technology partners GmbH
+ - Guido Wischrop <guido.wischrop@mgm-tp.com>

README.md

@@ -1,18 +1,47 @@
-[![Building All Containers](https://github.com/hyperledger/indy-node-container/actions/workflows/build-all.yml/badge.svg)](https://github.com/hyperledger/indy-node-container/actions/workflows/build-all.yml)
-
-
 # Indy Node Container
 
+[![Building All Containers](https://github.com/hyperledger/indy-node-container/actions/workflows/build-all.yml/badge.svg)](https://github.com/hyperledger/indy-node-container/actions/workflows/build-all.yml)
+
 This repository aims to provide easy-to-use containers with minimal dependencies to run instances of [Hyperledger Indy Node](https://github.com/hyperledger/indy-node). The primary goal is to support stewards joining an existing Network, but of course the containers can also be used in a stand alone (local/test/...) network. The initial contributions stem from the Container Working Group of [ID Union](https://github.com/IDunion). The repository was contributed to Hyperledger in 2022-02.
 
 Primary artifact are the container images for
+
 - [Indy Node](https://github.com/hyperledger/indy-node-container/pkgs/container/indy-node-container%2Findy_node)
 - and the [Indy Node Controller](https://github.com/hyperledger/indy-node-container/pkgs/container/indy-node-container%2Findy_node_controller)
  which are build from the files in [the build folder](build/).
 
 We also provide a few [utility scripts, including a docker-compose file](run/) to help setting up a run time environment for the containers.
 See [here](run/) for instructions how to setup and run the indy node images from this repository.
 
+## Building
+
+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
+```
+
+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 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
+```
+
+Please note that `make` generates different tags than the Github action (see [packages](https://github.com/hyperledger/indy-node-container/pkgs/container/indy-node-container%2Findy_node) vs. [Makefile](./Makefile)).
+
+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
+```
+
+Trivy HTML reports are created in `./trivy-reports`.
 
 ## Contributing
 
@@ -26,7 +55,6 @@ Be excellent to each other!
 
 [See CODE_OF_CONDUCT.md for details.](CODE_OF_CONDUCT.md)
 
-
 ## License
 
 Copyright 2020-2022 by all parties listed in the [NOTICE](NOTICE) file
@@ -35,11 +63,10 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+<http://www.apache.org/licenses/LICENSE-2.0>
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-   

trivy/html.tpl

@@ -52,7 +52,7 @@
       }
       a.toggle-more-links { cursor: pointer; }
     </style>
-    <title>{{- escapeXML ( index . 0 ).Target }} - Trivy Report - {{ getCurrentTime }}</title>
+    <title>{{- escapeXML ( index . 0 ).Target }} - Trivy Report - {{ now }}</title>
     <script>
       window.onload = function() {
         document.querySelectorAll('td.links').forEach(function(linkCell) {
@@ -82,7 +82,7 @@
     </script>
   </head>
   <body>
-    <h1>{{- escapeXML ( index . 0 ).Target }} - Trivy Report - {{ getCurrentTime }}</h1>
+    <h1>{{- escapeXML ( index . 0 ).Target }} - Trivy Report - {{ now }}</h1>
     <table>
     {{- range . }}
       <tr class="group-header"><th colspan="6">{{ escapeXML .Type }}</th></tr>