Merge branch 'develop' into 179-implement-data-persisting-for-user-management

.editorconfig

@@ -10,3 +10,8 @@ end_of_line = lf
 
 [{*.yaml, *.yml}]
 indent_size = 2
+
+[{Makefile,**.mk}]
+# Use tabs for indentation (Makefiles require tabs)
+indent_style = tab
+

.gitlab/ci/.build-container.yml

@@ -4,21 +4,9 @@
       - shell-builder
     variables:
         TAG: $CI_COMMIT_SHA
-    before_script:
-        # replace all slashes in the tag with hyphen, because slashes are not allowed in tags
-        - TAG=${TAG//\//-}
     needs: []
 
 build-testing-image:
-    rules:
-        - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-          variables:
-              TAG: latest
-        - if: $CI_COMMIT_BRANCH == "develop"
-          variables:
-              TAG: $CI_COMMIT_BRANCH
-              BUILDARGS: -race
-        - when: always
     script:
         - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
         - docker build -t "$GOSDN_TESTING_IMAGE" -f "${CI_PROJECT_DIR}/controller/Dockerfile" --target "installer" --build-arg "GOLANG_VERSION=$GOLANG_VERSION" --build-arg "BUILDARGS=$BUILDARGS" --build-arg "GITLAB_PROXY=${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/" .
@@ -26,17 +14,12 @@ build-testing-image:
     <<: *build
 
 build-image:
-    rules:
-        - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-          variables:
-              TAG: $CI_DEFAULT_BRANCH
-        - if: $CI_COMMIT_BRANCH == "develop"
-          variables:
-              TAG: develop
-              BUILDARGS: -race
-        - when: always
     script:
         - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-        - docker build -t "$CI_REGISTRY_IMAGE:$TAG" -f "${CI_PROJECT_DIR}/controller/Dockerfile" --target "installer" --build-arg "GOLANG_VERSION=$GOLANG_VERSION" --build-arg "BUILDARGS=$BUILDARGS" --build-arg "GITLAB_PROXY=${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/" .
+        - docker build -t "$CI_REGISTRY_IMAGE:$TAG" -f "${CI_PROJECT_DIR}/controller/Dockerfile" --build-arg "GOLANG_VERSION=$GOLANG_VERSION" --build-arg "BUILDARGS=$BUILDARGS" --build-arg "GITLAB_PROXY=${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/" .
         - docker push "$CI_REGISTRY_IMAGE:$TAG"
+        # replace all slashes in the tag with hyphen, because slashes are not allowed in tags
+        - NEWTAG=${CI_COMMIT_BRANCH//\//-}
+        - docker tag "$CI_REGISTRY_IMAGE:$TAG" "$CI_REGISTRY_IMAGE:$NEWTAG"
+        - docker push "$CI_REGISTRY_IMAGE:$NEWTAG"
     <<: *build

Makefile

@@ -2,6 +2,7 @@ MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
 MAKEFILE_DIR  := $(dir $(MAKEFILE_PATH))
 TOOLS_DIR:= build-tools
 GOSDN_PRG := $(MAKEFILE_DIR)$(TOOLS_DIR)
+GOPATH := $(~/go)
 GOBIN := $(GOSDN_PRG)
 
 GOCMD=go
@@ -18,8 +19,8 @@ pre:
 install-tools:
 	@echo Install development tooling
 	mkdir -p $(GOSDN_PRG)
-	go install gotest.tools/gotestsum@v1.7.0
-	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.45.1
+	export GOBIN=$(GOSDN_PRG) && go install gotest.tools/gotestsum@v1.7.0 &&\
+	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.45.1 &&\
 	go install github.com/vektra/mockery/v2@v2.11.0
 	@echo Finished installing development tooling