Merge branch 'develop'

Исправлен вызов компилятора для "зашивания" версии при сборке

.gitlab-ci.yml

@@ -26,7 +26,7 @@ variables:
 .docker_template: &setup_docker_environment
   image: docker:latest
   before_script:
-    - docker login -u gitlab-ci -p $CI_BUILD_TOKEN registry.ely.by
+    - docker login -u gitlab-ci -p $CI_JOB_TOKEN registry.ely.by
     - export TEMP_IMAGE_NAME="$CONTAINER_IMAGE:$CI_PIPELINE_ID"
 
 test:
@@ -39,12 +39,12 @@ build executable:
   <<: *setup_go_environment
   stage: build
   script:
-    - export VERSION="${CI_BUILD_TAG:-dev-$CI_BUILD_REF_NAME-${CI_BUILD_REF:0:8}+build-$CI_BUILD_ID}"
+    - export VERSION="${CI_COMMIT_TAG:-dev-$CI_COMMIT_REF_NAME-${CI_COMMIT_SHA:0:8}+build-$CI_JOB_ID}"
     - >
       env GOOS=linux
       go build
       -o $CI_PROJECT_DIR/minecraft-skinsystem
-      -ldflags "-X ${CI_PROJECT_NAMESPACE}/bootstrap.version=${VERSION}"
+      -ldflags "-X ${CI_PROJECT_PATH}/bootstrap.version=${VERSION}"
       main.go
   artifacts:
     name: "${CI_JOB_STAGE} executable"
@@ -79,7 +79,7 @@ push tag:
   variables:
     GIT_STRATEGY: none
   script:
-    - export IMAGE_NAME="$CONTAINER_IMAGE:$CI_BUILD_TAG"
+    - export IMAGE_NAME="$CONTAINER_IMAGE:$CI_COMMIT_TAG"
     - export LATEST_IMAGE_NAME="$CONTAINER_IMAGE:latest"
     - docker tag $TEMP_IMAGE_NAME $IMAGE_NAME
     - docker tag $TEMP_IMAGE_NAME $LATEST_IMAGE_NAME

cmd/version.go

@@ -0,0 +1,23 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+	"elyby/minecraft-skinsystem/bootstrap"
+	"runtime"
+)
+
+var versionCmd = &cobra.Command{
+	Use:   "version",
+	Short: "Show the Minecraft Skinsystem version information",
+	Run: func(cmd *cobra.Command, args []string) {
+		fmt.Printf("Version:    %s\n",    bootstrap.GetVersion())
+		fmt.Printf("Go version: %s\n",    runtime.Version())
+		fmt.Printf("OS/Arch:    %s/%s\n", runtime.GOOS, runtime.GOARCH)
+	},
+}
+
+func init() {
+	RootCmd.AddCommand(versionCmd)
+}

db/redis.go

@@ -114,15 +114,13 @@ func (db *redisDb) FindByUsername(username string) (*model.Skin, error) {
 
 	result, err := zlibDecode(encodedResult)
 	if err != nil {
-		log.Println("Cannot uncompress zlib for key " + redisKey) // TODO: replace with valid error
 		return nil, err
 	}
 
 	var skin *model.Skin
 	err = json.Unmarshal(result, &skin)
 	if err != nil {
-		log.Println("Cannot decode record data for key" + redisKey) // TODO: replace with valid error
-		return nil, nil
+		return nil, err
 	}
 
 	skin.OldUsername = skin.Username
@@ -133,7 +131,7 @@ func (db *redisDb) FindByUsername(username string) (*model.Skin, error) {
 func (db *redisDb) FindByUserId(id int) (*model.Skin, error) {
 	response := db.conn.Cmd("HGET", accountIdToUsernameKey, id)
 	if response.IsType(redis.Nil) {
-		return nil, SkinNotFoundError{"unknown"}
+		return nil, &SkinNotFoundError{"unknown"}
 	}
 
 	username, _ := response.Str()

docker/Dockerfile

@@ -1,5 +1,9 @@
 FROM alpine:3.6
 
+RUN apk --update add ca-certificates \
+ && update-ca-certificates \
+ && rm -rf /var/cache/apk/*
+
 COPY docker/docker-entrypoint.sh /usr/local/bin/
 COPY docker/config.dist.yml /usr/local/etc/minecraft-skinsystem/
 

docker/docker-compose.prod.yml

@@ -18,6 +18,8 @@ services:
       - redis
       - rabbitmq
     command: ["amqp-worker"]
+    volumes:
+      - ./config/minecraft-skinsystem:/etc/minecraft-skinsystem
 
   redis:
     image: redis:3.2-32bit # 32-bit version used to decrease memory usage