Merge branch 'master' of git.aipark.com:eoc-group/dotnet-cicd-demo

.gitlab-ci.yml

@@ -13,17 +13,14 @@ services:
 before_script:
   - echo "$CI_REGISTRY_IMAGE"
   - echo "$CI_COMMIT_REF_SLUG"
-  - echo "$CI_COMMIT_TIMESTAMP"
-  - echo "$CI_JOB_STARTED_AT"
-  - echo "$BASE_VERSION.$CI_TIMESTAMP"
-  - VE=$(date +"%y%m%d%H%M")
-  - echo $VE
+  - FULLVERSION=BASE_VERSION.$(date +"%y%m%d%H%M")
+  - export $FULLVERSION
+  - echo $FULLVERSION
   - docker login -u 'tcr$eoc' -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
 
 build-master-x86:
   stage: build
   script:
-    - FULLVERSION=$BASE_VERSION.$CI_TIMESTAMP
     - docker build -t $CI_REGISTRY_IMAGE:$FULLVERSION-amd64 . --pull -f Dockerfile --platform linux/amd64
     - docker push $CI_REGISTRY_IMAGE:$FULLVERSION
   only:
@@ -34,7 +31,6 @@ build-master-x86:
 build-master-arm64:
   stage: build
   script:
-    - FULLVERSION=$BASE_VERSION.$CI_TIMESTAMP
     - docker build --pull -t $CI_REGISTRY_IMAGE:$FULLVERSION-arm64 .
     - docker push $CI_REGISTRY_IMAGE:$FULLVERSION
   only:
@@ -45,7 +41,6 @@ build-master-arm64:
 build-manifest:
   stage: build
   script:
-    - FULLVERSION=$BASE_VERSION.$CI_TIMESTAMP
     - docker manifest create $CI_REGISTRY_IMAGE:$FULLVERSION
       $CI_REGISTRY_IMAGE:$FULLVERSION-amd64
       $CI_REGISTRY_IMAGE:$FULLVERSION-arm64