Prepare 4.4.1 release

.travis.yml

@@ -52,12 +52,12 @@ jobs:
           env CGO_ENABLED=0 GOOS=linux GOARCH=amd64
           go build
           -o release/chrly
-          -ldflags '-extldflags "-static" -X github.com/elyby/chrly/version.version=$APP_VERSION -X github.com/elyby/chrly/version.commit=$TRAVIS_COMMIT'
+          -ldflags "-extldflags '-static' -X github.com/elyby/chrly/version.version=$APP_VERSION -X github.com/elyby/chrly/version.commit=$TRAVIS_COMMIT"
           main.go
         - docker build -t elyby/chrly:$DOCKER_TAG .
         - docker push elyby/chrly:$DOCKER_TAG
         - |
-          if [ ! -z ${TRAVIS_TAG+x} ] && [[ "$TRAVIS_TAG" != *"-"* ]]; then
+          if [ ! -z ${TRAVIS_TAG:+x} ]; then
             docker tag elyby/chrly:$DOCKER_TAG elyby/chrly:latest
             docker push elyby/chrly:latest
           fi

CHANGELOG.md

@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased] - xxxx-xx-xx
 
+## [4.4.1] - 2020-04-24
+### Added
+- [#20](https://github.com/elyby/chrly/issues/20): Print hostname in the `version` command output.
+- [#21](https://github.com/elyby/chrly/issues/21): Print Chrly's version during server startup.
+
+### Fixed
+- [#22](https://github.com/elyby/chrly/issues/22): Correct version passing during building of the Docker image.
+
 ## [4.4.0] - 2020-04-22
 ### Added
 - Mojang textures queue now can be completely disabled via `MOJANG_TEXTURES_ENABLED` param.
@@ -116,7 +124,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   from the textures link instead.
 - `hash` field from `POST /api/skins` endpoint.
 
-[Unreleased]: https://github.com/elyby/chrly/compare/4.4.0...HEAD
+[Unreleased]: https://github.com/elyby/chrly/compare/4.4.1...HEAD
+[4.4.1]: https://github.com/elyby/chrly/compare/4.4.0...4.4.1
 [4.4.0]: https://github.com/elyby/chrly/compare/4.3.0...4.4.0
 [4.3.0]: https://github.com/elyby/chrly/compare/4.2.3...4.3.0
 [4.2.3]: https://github.com/elyby/chrly/compare/4.2.2...4.2.3

cmd/version.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"fmt"
+	"os"
 	"runtime"
 
 	"github.com/spf13/cobra"
@@ -13,10 +14,16 @@ var versionCmd = &cobra.Command{
 	Use:   "version",
 	Short: "Show the Chrly version information",
 	Run: func(cmd *cobra.Command, args []string) {
+		hostname, err := os.Hostname()
+		if err != nil {
+			hostname = "<unknown>"
+		}
+
 		fmt.Printf("Version:    %s\n", version.Version())
 		fmt.Printf("Commit:     %s\n", version.Commit())
 		fmt.Printf("Go version: %s\n", runtime.Version())
 		fmt.Printf("OS/Arch:    %s/%s\n", runtime.GOOS, runtime.GOARCH)
+		fmt.Printf("Hostname:   %s\n", hostname)
 	},
 }
 

http/http.go

@@ -13,6 +13,7 @@ import (
 	"github.com/mono83/slf/wd"
 
 	"github.com/elyby/chrly/dispatcher"
+	v "github.com/elyby/chrly/version"
 )
 
 type Emitter interface {
@@ -20,6 +21,8 @@ type Emitter interface {
 }
 
 func StartServer(server *http.Server, logger slf.Logger) {
+	logger.Debug("Chrly :v (:c)", wd.StringParam("v", v.Version()), wd.StringParam("c", v.Commit()))
+
 	done := make(chan bool, 1)
 	go func() {
 		logger.Info("Starting the server, HTTP on: :addr", wd.StringParam("addr", server.Addr))