truongbb - test ci

.env

+TAG=latest
+IMAGE_TYPE=dev
+IMAGE_REGISTRY_URL=192.168.1.204:8081
+PROJECT_VERSION=0.0.1-SNAPSHOT
+JDK_BASE_IMAGE=centos:oracle-jdk-10
+PROJECT_CODE=spring-ci-advanced

.gitlab-ci.yml

@@ -76,11 +76,13 @@ check_quality_gate:
 build_up:
   stage: build_up
   only:
-    #    - master
-    - merge_requests
+    - master
+  #    - merge_requests
   script:
     - cd /root/GitlabRunner/repo/spring-ci-advanced
     - ls
+    - chmod +x ./build-test.sh
+    - ./build-test.sh docker-build
 
 send_email:
   stage: send_email

Dockerfile

+ARG JDK_BASE_IMAGE
+FROM ${JDK_BASE_IMAGE}
+
+ARG PROJECT_VERSION
+ENV PROJECT_VERSION ${PROJECT_VERSION}
+WORKDIR /app
+COPY target/spring-ci-advanced-$PROJECT_VERSION.jar spring-ci-advanced.jar
+ENTRYPOINT ["java","-Djava.security.egd=file:///dev/urandom","-jar", "/app/spring-ci-advanced.jar"]
+CMD ["-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:9013","--spring.profiles.active=native,dev"]

build-test.sh

@@ -12,7 +12,7 @@ sub_help(){
     echo "    compile           Compile java code"
     echo "    sonar-scan        Run sonar scanner"
     echo "    quality-gate      Check quality gate"
-    echo "    build-up          Build project with docker"
+    echo "    docker-build      Build project with docker"
     echo "    send-email        Send email after stage/pipeline"
     echo ""
     echo "For help with each sub-command run:"
@@ -59,8 +59,16 @@ sub_quality-gate(){
     fi
 }
 
-sub_build-up(){
-    echo "TODO - BUILD UP"
+sub_docker-build(){
+    if [[ -d 'commons/target' ]]
+    then
+        echo "Already packaged!"
+    else
+        echo "Need to package before building with docker-compose.."
+        sub_package
+    fi
+
+    docker-compose -f deploy/docker-compose.yml build
 }
 
 sub_send-email(){
@@ -76,6 +84,10 @@ _docker_mvn() {
         mvn -U clean $@
 }
 
+sub_package() {
+    _docker_mvn package -DskipTests
+}
+
 sub_command=$1
 
 case sub_command in

deploy/docker-compose-services-stack.yml → deploy/docker-compose.yml

 version: '3.2'
 
-volumes:
-  gnoc_logs: {}
-  od-temp:
-    driver: local
-    driver_opts:
-      type: none
-      device: ${GNOC_TEMP_MOUNT_LOCATION}/${GNOC_OD_TEMP_FOLDER}
-      o: bind
-  od-upload:
-    driver: local
-    driver_opts:
-      type: none
-      device: ${GNOC_UPLOAD_MOUNT_LOCATION}/${GNOC_OD_UPLOAD_FOLDER}
-      o: bind
 services:
   od-service:
     build:
-      context: ../od-service
+      context: ../../spring-ci-advanced
       args:
         PROJECT_VERSION: ${PROJECT_VERSION}
         JDK_BASE_IMAGE: ${JDK_BASE_IMAGE}
-    image: "${IMAGE_REGISTRY_URL}/${PROJECT_CODE}/${IMAGE_TYPE}/od-service:${TAG}"
-    container_name: "od-service"
+    image: "${IMAGE_REGISTRY_URL}/${PROJECT_CODE}/${IMAGE_TYPE}/spring-ci-advanced:${TAG}"
+    container_name: "spring-ci-advanced"
     network_mode: "host"
-    volumes: ['gnoc_logs:/app/log','od-temp:/app/od-temp','od-upload:/app/od-upload']
     environment:
       TZ: "Asia/Ho_Chi_Minh"
-    #    depends_on:
-    #      - configuration-service
-    #      - discovery-service
-    #      - hazelcast-server
     restart: always