diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 6e801b8..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.github/workflows/maven-make-docker.yml b/.github/workflows/maven-make-docker.yml index 9abe115..c1b539e 100644 --- a/.github/workflows/maven-make-docker.yml +++ b/.github/workflows/maven-make-docker.yml @@ -48,7 +48,7 @@ jobs: }] - name: Build, test and package - run: ./mvnw -B clean test jar:jar + run: ./mvnw -B clean package - uses: docker/setup-buildx-action@v3.3.0 id: buildx diff --git a/.github/workflows/target_workflow.yml b/.github/workflows/target_workflow.yml deleted file mode 100644 index b7d30ba..0000000 --- a/.github/workflows/target_workflow.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: My Target Workflow - -on: - workflow_dispatch: - inputs: - name: - description: 'name' - required: true - type: string - home: - description: 'home' - required: true - type: string - -jobs: - log-the-inputs: - runs-on: ubuntu-latest - steps: - - run: | - echo "Name: $NAME" - echo "hoem: $HOME" - env: - NAME: ${{ inputs.name }} - HOME: ${{ inputs.home }} - diff --git a/das-producer/Dockerfile b/das-producer/Dockerfile index 152cd20..80ea34d 100644 --- a/das-producer/Dockerfile +++ b/das-producer/Dockerfile @@ -9,7 +9,7 @@ RUN useradd -u 1000 ingressuser WORKDIR /opt USER ingressuser -ENV JAR_FILE=das-producer/target/app.jar +ENV JAR_FILE=das-producer/target/*.jar COPY ${JAR_FILE} /opt/app.jar ENTRYPOINT ["java", "-XshowSettings:vm", "-XX:+PrintFlagsFinal", "-XX:MaxRAMPercentage=70", "-Djava.security.egd=file:/dev/./urandom", "-Djava.awt.headless=true", "-jar", "/opt/app.jar"] diff --git a/das-producer/pom.xml b/das-producer/pom.xml index e8f2751..fa4da01 100644 --- a/das-producer/pom.xml +++ b/das-producer/pom.xml @@ -111,13 +111,17 @@ + - org.apache.maven.plugins - maven-jar-plugin - 2.3.2 - - app - + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + @@ -151,71 +155,6 @@ org.apache.maven.plugins maven-surefire-plugin - - io.fabric8 - docker-maven-plugin - 0.44.0 - - true - - - fibra/${project.artifactId} - - - - linux/amd64 - linux/arm64 - - - ${project.basedir} - - target/${project.build.finalName}.jar - - - latest - ${project.version} - - - - - - - - default - package - - build - - - - - org.codehaus.mojo license-maven-plugin