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

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

.gitlab-ci.yml

@@ -0,0 +1,106 @@
+image: docker:19.03.12
+
+stages:
+  - docker_test
+  - docker_push
+
+variables:
+  # When using dind service, we need to instruct docker to talk with
+  # the daemon started inside of the service. The daemon is available
+  # with a network connection instead of the default
+  # /var/run/docker.sock socket. Docker 19.03 does this automatically
+  # by setting the DOCKER_HOST in
+  # https://github.com/docker-library/docker/blob/d45051476babc297257df490d22cbd806f1b11e4/19.03/docker-entrypoint.sh#L23-L29
+  #
+  # The 'docker' hostname is the alias of the service container as described at
+  # https://docs.gitlab.com/ee/ci/docker/using_docker_images.html#accessing-the-services.
+  #
+  # Specify to Docker where to create the certificates, Docker will
+  # create them automatically on boot, and will create
+  # `/certs/client` that will be shared between the service and job
+  # container, thanks to volume mount from config.toml
+  DOCKER_TLS_CERTDIR: "/certs"
+  # Use TLS https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled
+  DOCKER_HOST: tcp://docker:2376
+
+services:
+  - docker:19.03.12-dind
+
+.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 cached for later jobs
+build_docker:
+  extends:
+    - .docker_cache
+  stage: docker_test
+  script:
+    # Try to load latest branch image from local tar or from registry
+    - docker load ci-exports/$CI_COMMIT_REF_SLUG.tar || docker pull $CI_REGISTRY_IMAGE:latest || true
+    - docker build --cache-from $CI_REGISTRY_IMAGE:latest --tag $CI_REGISTRY_IMAGE:latest .
+    - mkdir -p ci-exports/
+    - docker save $CI_REGISTRY_IMAGE:latest > ci-exports/$CI_COMMIT_REF_SLUG.tar
+
+# Publishes the configured CI registry (by default that's gitlab's registry)
+push_ci_registry:
+  extends:
+    - .docker_cache
+  stage: docker_push
+  cache:
+    policy: pull
+  before_script:
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+  script:
+    - cat ci-exports/$CI_COMMIT_REF_SLUG.tar | docker load
+    - docker tag $CI_REGISTRY_IMAGE:latest $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
+    - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
+    - docker push $CI_REGISTRY_IMAGE:latest
+  only:
+    refs:
+      # Make sure to protect these tags!
+      - /^v(\d+\.){2,3}\d+$/
+      - /.+-release$/
+    variables:
+      - $CI_REGISTRY
+      - $CI_REGISTRY_USER
+      - $CI_REGISTRY_PASSWORD
+      - $CI_REGISTRY_IMAGE
+
+# Publishes the cached image to docker
+push_dockerhub_registry:
+  extends:
+    - .docker_cache
+  stage: docker_push
+  cache:
+    policy: pull
+  before_script:
+    - docker login -u $DOCKERHUB_REGISTRY_USER -p $DOCKERHUB_REGISTRY_PASSWORD $DOCKERHUB_REGISTRY
+  script:
+    - cat ci-exports/$CI_COMMIT_REF_SLUG.tar | docker load
+    - docker tag $CI_REGISTRY_IMAGE:latest $DOCKERHUB_REGISTRY_IMAGE:$CI_COMMIT_TAG
+    - docker tag $CI_REGISTRY_IMAGE:latest $DOCKERHUB_REGISTRY_IMAGE:latest
+    - docker push $DOCKERHUB_REGISTRY_IMAGE:$CI_COMMIT_TAG
+    - docker push $DOCKERHUB_REGISTRY_IMAGE:latest
+    # 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:
+      # Make sure to protect these tags!
+      - /^v(\d+\.){2,3}\d+$/
+      - /.+-release$/
+    variables:
+      - $DOCKERHUB_REGISTRY
+      - $DOCKERHUB_REGISTRY_USER
+      - $DOCKERHUB_REGISTRY_PASSWORD
+      - $DOCKERHUB_REGISTRY_IMAGE

CHANGELOG.md

@@ -31,4 +31,4 @@
  * numRi per su3 file: 75 --> 77
 
 2016-01
- * fork from https://github.com/idk/reseed-tools
+ * fork from https://i2pgit.org/idk/reseed-tools

Dockerfile

@@ -1,8 +1,8 @@
 FROM debian:stable-backports
 ARG I2P_GID=1000
 ARG I2P_UID=1000
-COPY . /var/lib/i2p/go/src/github.com/idk/reseed-tools
-WORKDIR /var/lib/i2p/go/src/github.com/idk/reseed-tools
+COPY . /var/lib/i2p/go/src/i2pgit.org/idk/reseed-tools
+WORKDIR /var/lib/i2p/go/src/i2pgit.org/idk/reseed-tools
 RUN apt-get update && \
     apt-get dist-upgrade -y && \
     apt-get install -y git golang-1.13-go make && \
@@ -11,4 +11,4 @@ RUN apt-get update && \
 RUN /usr/lib/go-1.13/bin/go build -v -tags netgo -ldflags '-w -extldflags "-static"'
 USER $I2P_UID
 WORKDIR /var/lib/i2p/i2p-config/reseed
-ENTRYPOINT [ "/var/lib/i2p/go/src/github.com/idk/reseed-tools/entrypoint.sh" ]
+ENTRYPOINT [ "/var/lib/i2p/go/src/i2pgit.org/idk/reseed-tools/entrypoint.sh" ]

README.md

@@ -9,7 +9,7 @@ create, sign, and validate SU3 files. Please note that this requires at least Go
 If you have go installed you can download, build, and install this tool with `go get`
 
 ```
-go get github.com/idk/reseed-tools
+go get i2pgit.org/idk/reseed-tools
 i2p-tools -h
 ```
 
@@ -102,7 +102,7 @@ also a short guide and complete tech info.
 Requires ```go mod``` and at least go 1.13. To build the idk/reseed-tools
 fork, from anywhere:
 
-        git clone https://github.com/idk/reseed-tools
+        git clone https://i2pgit.org/idk/reseed-tools
         cd i2p-tools-1
         make build
 

cmd/reseed.go

@@ -18,10 +18,10 @@ import (
 	"github.com/cretz/bine/torutil/ed25519"
 	"github.com/eyedeekay/sam3"
 	"github.com/eyedeekay/sam3/i2pkeys"
-	"github.com/idk/reseed-tools/reseed"
 	"github.com/libp2p/go-libp2p"
 	"github.com/libp2p/go-libp2p-core/host"
 	"github.com/urfave/cli"
+	"i2pgit.org/idk/reseed-tools/reseed"
 )
 
 func NewReseedCommand() cli.Command {

cmd/utils.go

@@ -16,8 +16,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/idk/reseed-tools/reseed"
-	"github.com/idk/reseed-tools/su3"
+	"i2pgit.org/idk/reseed-tools/reseed"
+	"i2pgit.org/idk/reseed-tools/su3"
 )
 
 func loadPrivateKey(path string) (*rsa.PrivateKey, error) {
@@ -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')

cmd/verify.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/idk/reseed-tools/reseed"
-	"github.com/idk/reseed-tools/su3"
 	"github.com/urfave/cli"
+	"i2pgit.org/idk/reseed-tools/reseed"
+	"i2pgit.org/idk/reseed-tools/su3"
 )
 
 func NewSu3VerifyCommand() cli.Command {

entrypoint.sh

@@ -1,5 +1,5 @@
 #! /usr/bin/env sh
 
-cp -r /var/lib/i2p/go/src/github.com/idk/reseed-tools/content ./content
+cp -r /var/lib/i2p/go/src/i2pgit.org/idk/reseed-tools/content ./content
 
-/var/lib/i2p/go/src/github.com/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 $@

go.sum

@@ -66,7 +66,7 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/idk/reseed-tools v0.0.4/go.mod h1:l36HvPTtSxbLHelUNo/GQ7+wYbi+oEL2xv/XJnj8aS0=
+i2pgit.org/idk/reseed-tools v0.0.4/go.mod h1:l36HvPTtSxbLHelUNo/GQ7+wYbi+oEL2xv/XJnj8aS0=
 github.com/eyedeekay/ramp v0.0.0-20190429201811-305b382042ab h1:EfTRHxGSbiaEyxNzvKRBWVIDw3mD8xXGxj4gvwFzY7Q=
 github.com/eyedeekay/ramp v0.0.0-20190429201811-305b382042ab/go.mod h1:h7mvUAMgZ/rtRDUOkvKTK+8LnDMeUhJSoa5EPdB51fc=
 github.com/eyedeekay/sam3 v0.32.2 h1:xODDY5nBVg0oK7KaYk7ofkXFoHPsmI1umhSv1TZlS7s=

history.txt

@@ -41,4 +41,4 @@
  * numRi per su3 file: 75 --> 77
 
 2016-01
- * fork from https://github.com/idk/reseed-tools
+ * fork from https://i2pgit.org/idk/reseed-tools

main.go

@@ -4,8 +4,8 @@ import (
 	"os"
 	"runtime"
 
-	"github.com/idk/reseed-tools/cmd"
 	"github.com/urfave/cli"
+	"i2pgit.org/idk/reseed-tools/cmd"
 )
 
 func main() {

reseed/homepage.go

@@ -84,7 +84,7 @@ func HandleAFile(w http.ResponseWriter, dirPath, file string) {
 		path := filepath.Join(BaseContentPath, file)
 		f, err := ioutil.ReadFile(path)
 		if err != nil {
-			w.Write([]byte("Oops! Something went wrong handling your language. Please file a bug at https://github.com/idk/reseed-tools\n\t" + err.Error()))
+			w.Write([]byte("Oops! Something went wrong handling your language. Please file a bug at https://i2pgit.org/idk/reseed-tools\n\t" + err.Error()))
 			return
 		}
 		CachedDataPages[file] = f
@@ -99,7 +99,7 @@ func HandleALocalizedFile(w http.ResponseWriter, dirPath string) {
 		dir := filepath.Join(BaseContentPath, "lang", dirPath)
 		files, err := ioutil.ReadDir(dir)
 		if err != nil {
-			w.Write([]byte("Oops! Something went wrong handling your language. Please file a bug at https://github.com/idk/reseed-tools\n\t" + err.Error()))
+			w.Write([]byte("Oops! Something went wrong handling your language. Please file a bug at https://i2pgit.org/idk/reseed-tools\n\t" + err.Error()))
 		}
 		var f []byte
 		for _, file := range files {
@@ -110,7 +110,7 @@ func HandleALocalizedFile(w http.ResponseWriter, dirPath string) {
 			path := filepath.Join(dir, file.Name())
 			b, err := ioutil.ReadFile(path)
 			if err != nil {
-				w.Write([]byte("Oops! Something went wrong handling your language. Please file a bug at https://github.com/idk/reseed-tools\n\t" + err.Error()))
+				w.Write([]byte("Oops! Something went wrong handling your language. Please file a bug at https://i2pgit.org/idk/reseed-tools\n\t" + err.Error()))
 				return
 			}
 			f = append(f, []byte(`<div id="`+trimmedName+`">`)...)

reseed/service.go

@@ -15,7 +15,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/idk/reseed-tools/su3"
+	"i2pgit.org/idk/reseed-tools/su3"
 )
 
 type routerInfo struct {