testing docker - jenkins

2020-09-28 09:51:42 +02:00
parent 57e1942eb7
commit 9a27c021fe
5 changed files with 33 additions and 50 deletions
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -22,12 +22,7 @@
    <select />
  </component>
  <component name="ChangeListManager">
-    <list default="true" id="458cde88-df3d-44bc-9d57-a33823e2f1a6" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/docker/Dockerfile" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/docker/docker-compose.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java" afterDir="false" />
-    </list>
+    <list default="true" id="458cde88-df3d-44bc-9d57-a33823e2f1a6" name="Default Changelist" comment="" />
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -515,7 +510,14 @@
      <option name="project" value="LOCAL" />
      <updated>1601021813429</updated>
    </task>
-    <option name="localTasksCounter" value="46" />
+    <task id="LOCAL-00046" summary="testing docker jenkins">
+      <created>1601278297201</created>
+      <option name="number" value="00046" />
+      <option name="presentableId" value="LOCAL-00046" />
+      <option name="project" value="LOCAL" />
+      <updated>1601278297201</updated>
+    </task>
+    <option name="localTasksCounter" value="47" />
    <servers />
  </component>
  <component name="UnknownFeatures">
@@ -535,7 +537,6 @@
  </component>
  <component name="VcsManagerConfiguration">
    <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="adding remove button for httpHeaders form" />
    <MESSAGE value="fix for null headers" />
    <MESSAGE value="Refactoring:&#10;- splitting and renaming MockedResponseDto.class into MockedMessageDto and MockedMessage&#10;- cleaning pom&#10;- adding mapStruct&#10;- adding new operation; getAllMockedMessages" />
    <MESSAGE value="- default method for MockedMessageMapper interface&#10;- changing requests from MockedMessage to MockedMessageDto" />
@@ -560,7 +561,8 @@
    <MESSAGE value="KT in README.md" />
    <MESSAGE value="fabric8" />
    <MESSAGE value="updating Dockerfile, adding  fabric8" />
-    <option name="LAST_COMMIT_MESSAGE" value="updating Dockerfile, adding  fabric8" />
+    <MESSAGE value="testing docker jenkins" />
+    <option name="LAST_COMMIT_MESSAGE" value="testing docker jenkins" />
  </component>
  <component name="WindowStateProjectService">
    <state x="904" y="236" key="#Notifications" timestamp="1600868491636">
@@ -658,13 +660,13 @@
    </state>
    <state x="277" y="57" key="SettingsEditor/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1600935670743" />
    <state x="277" y="57" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1600868466042" />
-    <state x="361" y="145" key="Vcs.Push.Dialog.v2" timestamp="1601021815603">
+    <state x="361" y="145" key="Vcs.Push.Dialog.v2" timestamp="1601278299061">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="451" y="183" key="Vcs.Push.Dialog.v2/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275760386" />
    <state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1600350277680" />
    <state x="2371" y="183" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1600351824385" />
-    <state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1601021815603" />
+    <state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1601278299061" />
    <state x="478" y="145" width="579" height="592" key="find.popup" timestamp="1599656923861">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
--- a/24
+++ b/24
@@ -1,7 +1,17 @@
-FROM openjdk:14-alpine as builder
-RUN apk add --no-cache maven
-WORKDIR /usr/app/klaus
-COPY ./ ./
-RUN mvn --version
-RUN mvn clean install -B
-CMD mvn spring-boot:run
+FROM openjdk:14-jre-slim as builder
+WORKDIR application
+ADD maven/${project.build.finalName}.jar ${project.build.finalName}.jar
+RUN java -Djarmode=layertools -jar ${project.build.finalName}.jar extract
+
+FROM openjdk:14-jre-slim
+LABEL PROJECT_NAME=${project.artifactId} \
+      PROJECT=${project.id}
+
+EXPOSE 8080
+
+WORKDIR application
+COPY --from=builder application/dependencies/ ./
+COPY --from=builder application/spring-boot-loader/ ./
+COPY --from=builder application/snapshot-dependencies/ ./
+COPY --from=builder application/application/ ./
+ENTRYPOINT["java", "-Djava.security.cgd=file:/dev/./urandom", "org.springframework.boot.loader.JarLauncher"]
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,9 @@ services:
    restart: "no"
  klaus:
    restart: "no"
-    build: Dockerfile
+    build:
+      context: .
+      dockerfile: Dockerfile
    ports:
      - "8097:8097"
    depends_on:
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,17 +0,0 @@
-FROM openjdk:14-jre-slim as builder
-WORKDIR application
-ADD maven/${project.build.finalName}.jar ${project.build.finalName}.jar
-RUN java -Djarmode=layertools -jar ${project.build.finalName}.jar extract
-
-FROM openjdk:14-jre-slim
-LABEL PROJECT_NAME=${project.artifactId} \
-      PROJECT=${project.id}
-
-EXPOSE 8080
-
-WORKDIR application
-COPY --from=builder application/dependencies/ ./
-COPY --from=builder application/spring-boot-loader/ ./
-COPY --from=builder application/snapshot-dependencies/ ./
-COPY --from=builder application/application/ ./
-ENTRYPOINT["java", "-Djava.security.cgd=file:/dev/./urandom", "org.springframework.boot.loader.JarLauncher"]
--- a/src/main/docker/docker-compose.yml
+++ b/src/main/docker/docker-compose.yml
@@ -1,14 +0,0 @@
-version: '3'
-services:
-  redis-server:
-    image: 'redis'
-    restart: "no"
-  klaus:
-    restart: "no"
-    build:
-      context: .
-      dockerfile: Dockerfile
-    ports:
-      - "8097:8097"
-    depends_on:
-      - redis-server