Compare commits

5 Commits

Author SHA1 Message Date
b724f4e51c Merge branches 'ci-build-images', 'bug-cannot-autogenerate-self_signed-keys' and 'bug-cannot-start-container' into alt-master 2021-01-01 16:35:03 +01:00
a7c097d232 fix: auto-generate keys when --yes is passed
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
2021-01-01 16:21:56 +01:00
7282cb5fa0 fix: Use correct command name in entrypoint.sh
The generated executable isn't called i2p-tools-1 but reseed-tools.
Without the correct name, the container wouldn't start.
2021-01-01 16:18:33 +01:00
2f8508ee92 ci: Use multiline chomp in YAML
It put the backslashes right into the bash command bash didn't really like that.
Bash escaped spaces and that lead to a bad command
2020-12-29 16:21:29 +01:00
b036b9e8f8 ci: Quote variables properly 2020-12-29 10:47:08 +01:00
3 changed files with 8 additions and 7 deletions

View File

@@ -87,11 +87,12 @@ push_dockerhub_registry:
- 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' \
- >-
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:

View File

@@ -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')

View File

@@ -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 $@