diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 03f37de..87bd0fa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,21 +2,16 @@ image: maven:3.6.3-openjdk-17-slim stages: - build - - package build-job: stage: build script: - echo "Compiling the code..." - - "mvn compile" + - "sudo docker container stop my-bar" + - "sudo docker container rm my-bar" + - "sudo docker image rm my-bar:4.3.0" + - "sudo docker build -t my-bar ." + - "sudo docker run --name my-bar --restart=always -p 8091:8080 -d my-bar" - echo "Compile complete - only: - - back_release - -package-job: - stage: package - script: - - echo "Package the code" - - "mwn package" only: - back_release \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index f01a0c4..77c23eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,12 @@ -FROM openjdk:17-jdk-slim -VOLUME /tmp -ADD /target/*.jar my-bar.jar -ENTRYPOINT "java", "-jar", "/my-bar.jar" \ No newline at end of file +# Создание рабочей среды для сборки +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" \ No newline at end of file diff --git a/Dockerfile-handmade b/Dockerfile-handmade deleted file mode 100644 index 77c23eb..0000000 --- a/Dockerfile-handmade +++ /dev/null @@ -1,12 +0,0 @@ -# Создание рабочей среды для сборки -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" \ No newline at end of file diff --git a/Dockerfile-isNotWork b/Dockerfile-isNotWork new file mode 100644 index 0000000..f01a0c4 --- /dev/null +++ b/Dockerfile-isNotWork @@ -0,0 +1,4 @@ +FROM openjdk:17-jdk-slim +VOLUME /tmp +ADD /target/*.jar my-bar.jar +ENTRYPOINT "java", "-jar", "/my-bar.jar" \ No newline at end of file