diff --git a/Containerfile b/Containerfile deleted file mode 100644 index 20909b7333..0000000000 --- a/Containerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM tomcat:9-jre8-alpine - -RUN apk add --no-cache fontconfig ttf-dejavu - -ENV TZ="Europe/Rome" -ENV JAVA_OPTS="-DDISABLE_DROOLS_COMPILE=TRUE -Xms512M -Xmx1G -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005" -ENV USERDOMAIN="STUDIO-ML" - -COPY docker/tomcat/conf/integry/ems.properties /usr/local/tomcat/conf/integry/ -COPY docker/tomcat/conf/integry/ems_automated_operations.json /usr/local/tomcat/conf/integry/ -COPY docker/tomcat/conf/integry/ems_settings.json /usr/local/tomcat/conf/integry/ -COPY ems-engine/target/ems-api.war /usr/local/tomcat/webapps/ - -#COPY docker/FontTest.class . -#ENTRYPOINT ["java","FontTest"] - -EXPOSE 8080 -EXPOSE 5005 \ No newline at end of file diff --git a/build/Jenkinsfile.groovy b/build/Jenkinsfile.groovy index 2a550f2a89..7a487c1abb 100644 --- a/build/Jenkinsfile.groovy +++ b/build/Jenkinsfile.groovy @@ -42,7 +42,7 @@ pipeline { bat(script: 'mvn clean install -t toolchains-jenkins.xml', returnStdout: true) archiveArtifacts(artifacts: 'ems-engine/target/ems-api.war', onlyIfSuccessful: true) } - stash includes: 'ems-engine/target/ems-api.war,docker/**,Containerfile', name: 'container-files' + stash includes: 'ems-engine/target/ems-api.war,docker/**,Dockerfile', name: 'container-files' } } @@ -128,7 +128,7 @@ sleep 10''', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaul } // bat "docker buildx build --platform linux/amd64,linux/arm64 --push -t \"git.studioml.it/integry/ems-api${branchVersion}:latest\" ." - bat "podman build -f .\\Containerfile -t \"git.studioml.it/integry/ems-api${branchVersion}:latest\" ." + bat "podman build -t \"git.studioml.it/integry/ems-api${branchVersion}:latest\" ." bat "podman push \"git.studioml.it/integry/ems-api${branchVersion}:latest\"" //containerImageLink "git.studioml.it/integry/ems-api-${env.GIT_BRANCH.toLowerCase().replace('/', '-')}:latest}"