Merge branches 'ci-build-images', 'bug-cannot-autogenerate-self_signed-keys' and 'bug-cannot-start-container' into alt-master

Probably a typo in the if condition as the same commit uses the correct condition elsewhere.
Only if --yes isn't passed should the user be queried interactively

.dockerignore

@@ -1,6 +1,8 @@
-.git/
+.idea
+.git
 .gitlab-ci.yml
+.vscode
 
 # CI cache folder storing docker images
-ci-exports/
+ci-exports
 

.gitlab-ci.yml

@@ -28,12 +28,13 @@ services:
 
 .docker_cache:
   cache:
+    # The same key should be used across branches
     key: "$CI_COMMIT_REF_SLUG"
     paths:
       - ci-exports/*.tar
 
 # Make sure we can build a docker image
-# It's pushed to the pipeline-local registry which acts as a cache
+# It's cached for later jobs
 build_docker:
   extends:
     - .docker_cache
@@ -61,11 +62,13 @@ push_ci_registry:
     - docker push $CI_REGISTRY_IMAGE:latest
   only:
     refs:
-      - master
+      # Make sure to protect these tags!
+      - /^v(\d+\.){2,3}\d+$/
+      - /.+-release$/
     variables:
+      - $CI_REGISTRY
       - $CI_REGISTRY_USER
       - $CI_REGISTRY_PASSWORD
-      - $CI_REGISTRY
       - $CI_REGISTRY_IMAGE
 
 # Publishes the cached image to docker
@@ -83,13 +86,21 @@ push_dockerhub_registry:
     - docker tag $CI_REGISTRY_IMAGE:latest $DOCKERHUB_REGISTRY_IMAGE:latest
     - docker push $DOCKERHUB_REGISTRY_IMAGE:$CI_COMMIT_TAG
     - docker push $DOCKERHUB_REGISTRY_IMAGE:latest
-  # TODO: Use rules https://docs.gitlab.com/ee/ci/yaml/README.html#rules
+    # Push the readme to dockerhub
+    - >-
+      docker run -v $PWD:/workspace
+      -e DOCKERHUB_USERNAME="$DOCKERHUB_REGISTRY_USER"
+      -e DOCKERHUB_PASSWORD="$DOCKERHUB_REGISTRY_PASSWORD"
+      -e DOCKERHUB_REPOSITORY="$DOCKERHUB_REGISTRY_IMAGE"
+      -e README_FILEPATH='/workspace/README.md'
+      peterevans/dockerhub-description:2
   only:
     refs:
-#      - master
-      - tags
+      # Make sure to protect these tags!
+      - /^v(\d+\.){2,3}\d+$/
+      - /.+-release$/
     variables:
+      - $DOCKERHUB_REGISTRY
       - $DOCKERHUB_REGISTRY_USER
       - $DOCKERHUB_REGISTRY_PASSWORD
-      - $DOCKERHUB_REGISTRY
       - $DOCKERHUB_REGISTRY_IMAGE

cmd/utils.go

@@ -71,7 +71,7 @@ func checkOrNewTLSCert(tlsHost string, tlsCert, tlsKey *string, auto bool) error
 			fmt.Printf("Unable to read TLS key '%s'\n", *tlsKey)
 		}
 
-		if auto {
+		if !auto {
 			fmt.Printf("Would you like to generate a new self-signed certificate for '%s'? (y or n): ", tlsHost)
 			reader := bufio.NewReader(os.Stdin)
 			input, _ := reader.ReadString('\n')

entrypoint.sh

@@ -2,4 +2,4 @@
 
 cp -r /var/lib/i2p/go/src/i2pgit.org/idk/reseed-tools/content ./content
 
-/var/lib/i2p/go/src/i2pgit.org/idk/reseed-tools/i2p-tools-1 reseed --yes=true --netdb=/var/lib/i2p/i2p-config/netDb $@
+/var/lib/i2p/go/src/i2pgit.org/idk/reseed-tools/reseed-tools reseed --yes=true --netdb=/var/lib/i2p/i2p-config/netDb $@