Commit a6253b0a authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch '2-add-docker-compose-helm-chart-and-gitlab-cis' into 'develop' 

Resolve "Add deployment artifacts and gitlab CIs"

See merge request !1
parents 3da43d34 07217f3f

.gitlab-ci.yml

0 → 100644
+41 −0
Original line number Diff line number Diff line 
include:

  - project: osl/code/org.etsi.osl.main

    ref: main

    file: 

      - ci-templates/default.yml

      - ci-templates/build.yml

    rules:

      - if: '$CI_COMMIT_REF_NAME == "main"'

  

  - project: osl/code/org.etsi.osl.main

    ref: develop

    file: 

      - ci-templates/default.yml

      - ci-templates/build.yml

    rules:

      - if: '$CI_COMMIT_REF_NAME == "develop"'



  - project: osl/code/org.etsi.osl.main

    ref: $CI_COMMIT_REF_NAME

    file: 

      - ci-templates/default.yml

      - ci-templates/build.yml

    rules:

      - if: '$CI_COMMIT_REF_PROTECTED == "true" && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'



  - project: osl/code/org.etsi.osl.main

    ref: develop

    file: 

      - ci-templates/default.yml

      - ci-templates/build_unprotected.yml

    rules:

      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_PROTECTED == "false"'



maven_build:

  extends: .maven_build



docker_build:

  extends: .docker_build

  needs:

    - maven_build

Dockerfile

+11 −10
Original line number Diff line number Diff line 
# Multi-stage build for TFS Controller

# Stage 1: Build the application

FROM maven:3.9.6-eclipse-temurin-17 AS builder

# FROM maven:3.9.6-eclipse-temurin-17 AS builder



WORKDIR /build

# WORKDIR /build



# Copy pom.xml and download dependencies

COPY pom.xml .

RUN mvn dependency:go-offline -B

# # Copy pom.xml and download dependencies

# COPY pom.xml .

# RUN mvn dependency:go-offline -B



# Copy source code

COPY src ./src

# # Copy source code

# COPY src ./src



# Build the application

RUN mvn clean package -DskipTests

# # Build the application

# RUN mvn clean package -DskipTests



# Stage 2: Runtime image

FROM eclipse-temurin:17-jdk-alpine
@@ -20,7 +20,8 @@ FROM eclipse-temurin:17-jdk-alpine 
WORKDIR /app



# Copy the built JAR from builder stage

COPY --from=builder /build/target/org.etsi.osl.controllers.ietf.ns-0.0.1-SNAPSHOT.jar app.jar

# COPY --from=builder /build/target/org.etsi.osl.controllers.ietf.ns-0.0.9-SNAPSHOT.jar app.jar

COPY target/org.etsi.osl.controllers.ietf.ns-0.0.9-SNAPSHOT.jar app.jar



# Run the application

ENTRYPOINT ["java", "-jar", "app.jar"]

README.md

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ mvn clean package 
mvn spring-boot:run



# Run packaged JAR

java -jar target/org.etsi.osl.controllers.ietf.ns-0.0.1-SNAPSHOT.jar

java -jar target/org.etsi.osl.controllers.ietf.ns-0.0.9-SNAPSHOT.jar



# Build without tests

mvn clean package -DskipTests

ci_settings.xml

0 → 100644
+17 −0
Original line number Diff line number Diff line 
<settings xmlns="http://maven.apache.org/SETTINGS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">

  <servers>

    <server>

      <id>gitlab-maven</id>

      <configuration>

        <httpHeaders>

          <property>

            <name>Job-Token</name>

            <value>${CI_JOB_TOKEN}</value>

          </property>

        </httpHeaders>

      </configuration>

    </server>

  </servers>

</settings>

compose.yml

0 → 100644
+31 −0
Original line number Diff line number Diff line 
services:

  osl-ietf-ns-controller:

    build:

      context: .

      dockerfile: Dockerfile

    image: labs.etsi.org:5050/osl/code/addons/org.etsi.controllers.ietf.ns:develop

    container_name: osl-ietf-ns-controller

    restart: always

    profiles: ["dev", "prod"]

    environment:

      SPRING_ACTIVEMQ_BROKERURL: tcp://anartemis:61616?jms.watchTopicAdvisories=false

      SPRING_ACTIVEMQ_USER: artemis

      SPRING_ACTIVEMQ_PASSWORD: artemis

      RESTCONF_PROVIDERURL: "http://nscontroller:8085"

      RESTCONF_AUTHMETHOD: "basic"

      RESTCONF_AUTH_USERNAME: "admin"

      RESTCONF_AUTH_PASSWORD: "admin"

      RESTCONF_APIVERSION: "2025-05-09"

      LOGGING_LEVEL_ORG_SPRINGFRAMEWORK: INFO

    logging:

      driver: "json-file"

      options:

        max-size: "250m"

        max-file: "2"       

    networks:

    -  compose_back



networks:

  compose_back:

    external: true

    
 No newline at end of file