update pipeline, Dockerfile and Taskfile

Author: nobody8v

.gitlab-ci.yml

@@ -1,141 +1,18 @@
 stages:
-  # - mr-checks
+  - install-dependencies
   - build
   - update-version
-  # - deploy
-  # - code-test
-
+  #- check_registries
 include:
-  # - local: .cicd/telegram.yml
-
-
-build-docker-image:
-  #extends: [.telegram]
-
-  stage: build
-  tags:
-    - aether-runner
-  image:  golang:1.25
-  services:
-    - name: docker:20.10-dind
-      alias: docker
-      command: ["--insecure-registry=192.168.12.15:8083"]
-  variables:
-    DOCKER_TLS_CERTDIR: ""  # desactiva TLS para simplificar
-    DOCKER_HOST: tcp://docker:2375
-    DOCKER_DRIVER: overlay2
-  before_script:
-    - apt-get update && apt-get install -y docker.io
-    - docker version
-  script:
-    - docker info
-
-    - docker login --username $CI_REGISTRY_USER --password $CI_REGISTRY_PASSWORD $CI_REGISTRY
-
-    - apk update && apk add --no-cache make bash git wget
-
-    # -  wget https://go.dev/dl/go1.25.0.linux-amd64.tar.gz
-
-    # -  rm -rf /usr/local/go && tar -C /usr/local -xzf go1.25.0.linux-amd64.tar.gz
-
-    # - export PATH=$PATH:/usr/local/go/bin
-
-    # - go version
-
-    - echo "NF_VERSION=$(make -s -f Makefile print-tag)" > variables.env
-
-    - echo "CI_PROJECT_NAME=$(make -s -f Makefile print-target)" >> variables.env
-
-    - echo "BRANCH=$(make -s -f Makefile print-branch)" >> variables.env
-
-    - make docker-build
-
-    - make docker-push
-
-    - docker container prune --force
-
-    - docker image prune --force
-
-    - echo "Build and push of image completed!"
-
-  rules:
-    # Caso 1: MR a main
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main"'
-
-    # Caso 2: MR a dev
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "dev"'
-
-    # Caso 3: Push directo a main (NO desde un merge request)
-    - if: '$CI_COMMIT_BRANCH == "main" && $CI_PIPELINE_SOURCE == "push" && $CI_MERGE_REQUEST_ID == null'
-
-    # Caso 4: Push directo a dev (NO desde un merge request)
-    - if: '$CI_COMMIT_BRANCH == "dev" && $CI_PIPELINE_SOURCE == "push" && $CI_MERGE_REQUEST_ID == null'
-
-
-  artifacts:
-    reports:
-      dotenv: variables.env
-
-  needs: []
-
-
-update-helm-values:
-  stage: update-version
-  image: alpine:3.19
-  tags:
-    - aether-runner
-  before_script:
-    - apk add --no-cache git bash curl
-    - git config --global user.email "ci-bot@aether.local"
-    - git config --global user.name "CI Bot"
-    # - wget -qO /usr/local/bin/yq-go https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64
-    # - chmod +x /usr/local/bin/yq-go
-
-  script:
-    # 1. Clonar repo de infra (OnRamp)
-    - git clone https://$TOKEN_USER:$ONRAMP_TOKEN@$GITLAB_SERVER_URL/5g/aether.git
-    - cd aether
-
-    # 2. Crear rama nueva (basada en dev)
-    - BRANCH_NAME="update-${BRANCH}"
-    - git checkout dev
-    - git pull origin dev
-    - git checkout -b $BRANCH_NAME
-
-    # 3. Editar values.yaml (ejemplo: cambiar tag de la NF)
-    # - yq e -i '.amf.image.tag = env(NF_VERSION)' charts/aether/values.yaml
-    # - yq-go e -i '.["5g-control-plane"].images.tags.amf = env(NF_VERSION)' deps/5gc/roles/core/templates/sdcore-5g-values.yaml
-    - sed -i -E 's|^([[:space:]]{6}simapp:[[:space:]]*).*|\1'"$NF_VERSION"'|' deps/5gc/roles/core/templates/sdcore-5g-values.yaml
-
-
-    # 4. Commit y push
-    - git add deps/5gc/roles/core/templates/sdcore-5g-values.yaml
-    - git commit -m "Update ${CI_PROJECT_NAME} image to ${NF_VERSION}"
-    - git push origin $BRANCH_NAME
-
-    # 5. Crear MR automáticamente vía API de GitLab
-    - |
-       curl --header "PRIVATE-TOKEN: $ONRAMP_TOKEN" \
-       -X POST "https://${GITLAB_SERVER_URL}/api/v4/projects/1268/merge_requests" \
-       --data "source_branch=$BRANCH_NAME" \
-       --data "target_branch=dev" \
-       --data-urlencode "title=Update ${CI_PROJECT_NAME} image to ${NF_VERSION}" \
-       --data "remove_source_branch=true"
-
-  needs:
-    - job: build-docker-image
-      artifacts: true
-
-  rules:
-    # Caso 1: MR a main
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main"'
-
-    # Caso 2: MR a dev
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "dev"'
-
-    # Caso 3: Push directo a main (NO desde un merge request)
-    - if: '$CI_COMMIT_BRANCH == "main" && $CI_PIPELINE_SOURCE == "push" && $CI_MERGE_REQUEST_ID == null'
-
-    # Caso 4: Push directo a dev (NO desde un merge request)
-    - if: '$CI_COMMIT_BRANCH == "dev" && $CI_PIPELINE_SOURCE == "push" && $CI_MERGE_REQUEST_ID == null'
-
+  - component: $CI_SERVER_FQDN/5g/cicd-components/building-main-fast@main
+    inputs:
+      stage: build
+      stage_helm: update-version
+      tags: [aether-runner-3]
+      project_id: "1268" # OnRamp
+      nfs_name: "simapp"
+    rules:
+      - if: '$CI_COMMIT_REF_NAME == "main"'
+        when: always
+      - if: '$CI_COMMIT_REF_NAME == "dev"'
+        when: always

Dockerfile

@@ -14,6 +14,13 @@ RUN apt-get update && \
 RUN go install github.com/go-task/task/v3/cmd/task@latest
 
 WORKDIR $GOPATH/src/simapp
+
+COPY go.mod .
+COPY go.sum .
+COPY Taskfile.yml .
+
+RUN task mod-start
+
 COPY . .
 RUN task build
 
@@ -27,8 +34,8 @@ ARG DEBUG_TOOLS
 
 # Install debug tools ~ 50MB (if DEBUG_TOOLS is set to true)
 RUN if [ "$DEBUG_TOOLS" = "true" ]; then \
-        apk update && apk add --no-cache -U gcompat vim strace net-tools curl netcat-openbsd bind-tools bash; \
-        fi
+    apk update && apk add --no-cache -U gcompat vim strace net-tools curl netcat-openbsd bind-tools bash; \
+    fi
 
 # Copy executable
 COPY --from=builder /go/src/simapp/bin/* /usr/local/bin/.

Taskfile.yml

@@ -3,21 +3,21 @@
 # SPDX-License-Identifier: Apache-2.0
 # Taskfile equivalent to simapp Makefile
 
-version: '3'
+version: "3"
 
 vars:
   PROJECT_NAME: sdcore
   DOCKER_VERSION:
     sh: cat ./VERSION 2>/dev/null || echo "latest"
-  
+
   # Docker related
   DOCKER_REGISTRY: ""
   DOCKER_REPOSITORY: ""
   DOCKER_TAG: "{{.DOCKER_VERSION}}"
   DOCKER_IMAGENAME: "{{.DOCKER_REGISTRY}}{{.DOCKER_REPOSITORY}}{{.PROJECT_NAME}}:{{.DOCKER_TAG}}"
   DOCKER_BUILDKIT: 1
   DOCKER_BUILD_ARGS: ""
-  
+
   # Docker labels
   DOCKER_LABEL_VCS_URL:
     sh: git remote get-url $(git remote) 2>/dev/null || echo "unknown"
@@ -37,13 +37,13 @@ vars:
       fi
   DOCKER_LABEL_BUILD_DATE:
     sh: date -u "+%Y-%m-%dT%H:%M:%SZ"
-  
+
   DOCKER_TARGETS: simapp
   GO_BIN_PATH: bin
   GO_SRC_PATH: ./
   NF: simapp
   GO_NF: simapp
-  
+
   # Build info
   VERSION:
     sh: git describe --tags 2>/dev/null || echo "dev"
@@ -109,6 +109,13 @@ tasks:
             -v \
             ./ ./...
 
+  mod-start:
+    desc: "execute go mod download to performance the docker build step"
+    aliases: [mod]
+    cmds:
+      - cd {{.GO_SRC_PATH}}
+      - go mod download
+
   _coverage-dir:
     internal: true
     cmds: