изменение сi-cd 3
This commit is contained in:
@@ -2,6 +2,24 @@ image: maven:3.6.3-openjdk-17-slim
|
|||||||
|
|
||||||
stages:
|
stages:
|
||||||
- build
|
- build
|
||||||
|
- docker
|
||||||
|
|
||||||
|
maven-build:
|
||||||
|
image: maven:3.6.3-openjdk-17-slim
|
||||||
|
stage: build
|
||||||
|
script: "mvn -am clean package"
|
||||||
|
only:
|
||||||
|
- back_release
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- target/*.jar
|
||||||
|
|
||||||
|
docker-build:
|
||||||
|
stage: docker
|
||||||
|
script:
|
||||||
|
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN http://192.168.1.100:9093
|
||||||
|
- docker build -t gitlab.kayashov.keenetic.pro/kayashov/my-bar .
|
||||||
|
- docker push gitlab.kayashov.keenetic.pro/kayashov/my-bar
|
||||||
|
|
||||||
build-job:
|
build-job:
|
||||||
stage: build
|
stage: build
|
||||||
@@ -14,4 +32,4 @@ build-job:
|
|||||||
- "docker run --name my-bar --restart=always -p 8091:8080 -d my-bar"
|
- "docker run --name my-bar --restart=always -p 8091:8080 -d my-bar"
|
||||||
- echo "Compile complete
|
- echo "Compile complete
|
||||||
only:
|
only:
|
||||||
- back_release
|
- master
|
||||||
16
Dockerfile
16
Dockerfile
@@ -1,12 +1,4 @@
|
|||||||
# Создание рабочей среды для сборки
|
FROM openjdk:17-jdk-slim
|
||||||
FROM maven:3.6.3-openjdk-17-slim as build
|
VOLUME /tmp
|
||||||
RUN mkdir -p /build/source
|
ADD /target/*.jar my-bar.jar
|
||||||
COPY . /build/source
|
ENTRYPOINT "java", "-jar", "/my-bar.jar"
|
||||||
WORKDIR /build/source
|
|
||||||
RUN mvn -pl myBar -am clean package
|
|
||||||
# Создание образа my-bar
|
|
||||||
FROM openjdk:17-jdk-slim as my-bar
|
|
||||||
COPY --from=build /build/source/myBar/target/*jar /data/app/my-bar.jar
|
|
||||||
WORKDIR /data/app
|
|
||||||
EXPOSE 8080
|
|
||||||
ENTRYPOINT "java" $JAVA_OPTS "-jar" "/data/app/my-bar.jar"
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
FROM openjdk:17-jdk-slim
|
|
||||||
VOLUME /tmp
|
|
||||||
ADD /target/*.jar my-bar.jar
|
|
||||||
ENTRYPOINT "java", "-jar", "/my-bar.jar"
|
|
||||||
12
Dockerfile-old
Normal file
12
Dockerfile-old
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
# Создание рабочей среды для сборки
|
||||||
|
FROM maven:3.6.3-openjdk-17-slim as build
|
||||||
|
RUN mkdir -p /build/source
|
||||||
|
COPY . /build/source
|
||||||
|
WORKDIR /build/source
|
||||||
|
RUN mvn -pl myBar -am clean package
|
||||||
|
# Создание образа my-bar
|
||||||
|
FROM openjdk:17-jdk-slim as my-bar
|
||||||
|
COPY --from=build /build/source/myBar/target/*jar /data/app/my-bar.jar
|
||||||
|
WORKDIR /data/app
|
||||||
|
EXPOSE 8080
|
||||||
|
ENTRYPOINT "java" $JAVA_OPTS "-jar" "/data/app/my-bar.jar"
|
||||||
Reference in New Issue
Block a user