stnescha/init monorepo/ci

.gitlab/ci/.build-container.yml

 .build: &build
     stage: build
-    image:
-        name: gcr.io/kaniko-project/executor:debug
-        entrypoint: [""]
+    tags:
+      - shell-builder
     variables:
-        TAG: $CI_COMMIT_BRANCH
+        TAG: $CI_COMMIT_SHA
     before_script:
         # replace all slashes in the tag with hyphen, because slashes are not allowed in tags
-        - cd controller/
         - TAG=${TAG//\//-}
-        - mkdir -p /kaniko/.docker
-        - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"},\"$CI_DEPENDENCY_PROXY_SERVER\":{\"username\":\"$CI_DEPENDENCY_PROXY_USER\",\"password\":\"$CI_DEPENDENCY_PROXY_TOKEN\"}}}" > /kaniko/.docker/config.json
     needs: []
 
 build-testing-image:
@@ -24,15 +20,9 @@ build-testing-image:
               BUILDARGS: -race
         - when: always
     script:
-        - /kaniko/executor
-          --cache=true
-          --context "$CI_PROJECT_DIR"
-          --dockerfile "Dockerfile"
-          --build-arg "GOLANG_VERSION=$GOLANG_VERSION"
-          --build-arg "BUILDARGS=$BUILDARGS"
-          --build-arg "GITLAB_PROXY=${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/"
-          --destination "$GOSDN_TESTING_IMAGE"
-          --target "installer"
+        - 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}/" .
+        - docker push "$GOSDN_TESTING_IMAGE"
     <<: *build
 
 build-image:
@@ -48,13 +38,7 @@ build-image:
               BUILDARGS: -race
         - when: always
     script:
-        - /kaniko/executor
-          --cache=true
-          --context "$CI_PROJECT_DIR"
-          --dockerfile "Dockerfile"
-          --build-arg "GOLANG_VERSION=$GOLANG_VERSION"
-          --build-arg "BUILDARGS=$BUILDARGS"
-          --build-arg "GITLAB_PROXY=${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/"
-          --destination "$GOSDN_IMAGE"
-          --destination "$CI_REGISTRY_IMAGE:$TAG"
+        - 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 push "$CI_REGISTRY_IMAGE:$TAG"
     <<: *build

.gitlab/ci/.containerlab-ci.yml

@@ -48,7 +48,7 @@ variables:
 containerlab:template:integration:
     extends: .containerlab_template
     variables:
-        CLAB_TEMPLATE: "${CI_PROJECT_DIR}/test/containerlab/int01.clab.tmpl.yml"
+        CLAB_TEMPLATE: "${CI_PROJECT_DIR}/controller/test/containerlab/int01.clab.tmpl.yml"
 
 containerlab:deploy:integration:
     extends: .containerlab_deploy

.gitlab/ci/.test.yml

@@ -15,6 +15,7 @@
 
 unit-test:
     script:
+        - cd controller
         - make ci-unit-test
     after_script:
         - go tool cover -func=coverage.out
@@ -22,6 +23,7 @@ unit-test:
 
 controller-test:
     script:
+        - cd controller
         - make ci-controller-test
     <<: *test
 
@@ -29,5 +31,5 @@ test-build:
     artifacts:
         when: never
     script:
-        - GOOS=linux go build $BUILDARGS ./cmd/gosdn
+        - make build
     <<: *test

controller/Dockerfile

-FROM scratch
+ARG GOLANG_VERSION=1.18
+ARG BUILDARGS
+ARG $GITLAB_PROXY
+
+FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-buster AS installer
+
+WORKDIR /src/gosdn/controller
+COPY go.* ./
+RUN go mod download
+
+FROM installer as builder
+
+COPY ./controller ./
+
+RUN make build
+
+
+FROM scratch as gosdn
 
 COPY artifacts/gosdn /