Commit 5a9d5feb authored by Alicja Reniewicz's avatar Alicja Reniewicz
Browse files

Merge branch 'rc3.1--checking-ems' into 'rc3.1'

Rc3.1  checking ems

See merge request !12
parents 933335d3 b84c7354
......@@ -139,6 +139,15 @@ build:dlms-utility:
paths:
- $CI_PROJECT_DIR/dlms/DLMSUtility/target
build:dlms-agent:
stage: build
image: $MAVEN_IMAGE
script:
- $DLMS_AGENT_CLI -Pwithout-docker clean install
artifacts:
paths:
- $CI_PROJECT_DIR/dlmsAgent/target
build:penalty-calculator:
stage: build
image: $MAVEN_IMAGE
......@@ -175,15 +184,6 @@ build:zpp-solver:
paths:
- $CI_PROJECT_DIR/zpp-solver/target
build:dlms-agent:
stage: build
image: $MAVEN_IMAGE
script:
- $DLMS_AGENT_CLI -Pwithout-docker clean install
artifacts:
paths:
- $CI_PROJECT_DIR/dlmsAgent/target
build:ems:
stage: build
image: $MAVEN_IMAGE
......@@ -225,9 +225,6 @@ build:ems-baguette-client:
image: $MAVEN_IMAGE
script:
- $EMS_BAGUETTE_CLIENT_CLI -Pwithout-docker clean install
artifacts:
paths:
- $CI_PROJECT_DIR/event-management/baguette-client/target
build:ems-baguette-server:
stage: build
......@@ -256,6 +253,15 @@ build:ems-translator:
paths:
- $CI_PROJECT_DIR/event-management/translator/target
build:ems-server:
stage: build
image: $MAVEN_IMAGE
script:
- $EMS_SERVER_CLI -Pwithout-docker clean install
artifacts:
paths:
- $CI_PROJECT_DIR/event-management/control-service/target
deploy:melodic-upperware:
stage: deploy
only:
......
......@@ -31,7 +31,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.16.20</version>
<version>1.18.16</version>
<scope>provided</scope>
</dependency>
......
......@@ -54,7 +54,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.16.20</version>
<version>1.18.16</version>
<scope>provided</scope>
</dependency>
......@@ -90,7 +90,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptor>src/assembly/vm.xml</descriptor>
<descriptor>src/main/assembly/baguette-client-installation-package.xml</descriptor>
<finalName>baguette-client</finalName>
</configuration>
<executions>
......@@ -156,11 +156,11 @@
<configuration>
<fileSets>
<fileSet>
<sourceFile>target/baguette-client-vm.tgz</sourceFile>
<sourceFile>target/baguette-client-installation-package.tgz</sourceFile>
<destinationFile>../config-files/resources/baguette-client.tgz</destinationFile>
</fileSet>
<fileSet>
<sourceFile>target/baguette-client-vm.tgz.md5</sourceFile>
<sourceFile>target/baguette-client-installation-package.tgz.md5</sourceFile>
<destinationFile>../config-files/resources/baguette-client.tgz.md5</destinationFile>
</fileSet>
<fileSet>
......
......@@ -14,7 +14,7 @@
http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd"
>
<id>vm</id>
<id>installation-package</id>
<formats>
<format>tgz</format>
</formats>
......
......@@ -44,7 +44,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.16.20</version>
<version>1.18.16</version>
<scope>provided</scope>
</dependency>
<dependency>
......
......@@ -101,7 +101,8 @@ melodic.security.enabled=false
### Web configuration - Resources
static.favicon.path=classpath:/public/favicon.ico
static.resource.path=file:${MELODIC_CONFIG_DIR}/resources/
static.resource.path=file:resources/
#static.resource.path=file:${MELODIC_CONFIG_DIR}/resources/
#static.resource.path=file:/opt/ems-server/resources/
static.resource.context=/resources/**
#static.resource.redirect=/resources/index.html
......
......@@ -163,11 +163,85 @@
<type>jar</type>
<outputDirectory>${project.build.directory}</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>eu.melodic.event</groupId>
<artifactId>baguette-client</artifactId>
<version>${project.version}</version>
<type>tgz</type>
<classifier>installation-package</classifier>
<outputDirectory>${project.build.directory}</outputDirectory>
<destFileName>baguette-client.tgz</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<!-- Checksum Maven plugin (http://checksum-maven-plugin.nicoulaj.net) -->
<plugin>
<groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>files</goal>
</goals>
</execution>
</executions>
<configuration>
<fileSets>
<fileSet>
<directory>${project.build.directory}</directory>
<!--<directory>target</directory>-->
<includes>
<include>*.zip</include>
<include>*.tar</include>
<include>*.tar.gz</include>
<include>*.tgz</include>
</includes>
<excludes>
<exclude>*.jar</exclude>
</excludes>
</fileSet>
</fileSets>
<algorithms>
<algorithm>MD5</algorithm>
</algorithms>
<individualFiles>true</individualFiles>
<failOnError>true</failOnError>
<failIfNoFiles>false</failIfNoFiles>
</configuration>
</plugin>
<!-- Copy-Rename Maven plugin (https://coderplus.github.io/copy-rename-maven-plugin/) -->
<plugin>
<groupId>com.coderplus.maven.plugins</groupId>
<artifactId>copy-rename-maven-plugin</artifactId>
<version>1.0</version>
<executions>
<execution>
<id>copy-files</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<fileSets>
<fileSet>
<sourceFile>../baguette-client/bin/install.sh</sourceFile>
<destinationFile>target/install.sh</destinationFile>
</fileSet>
</fileSets>
<ignoreFileNotFoundOnIncremental>true</ignoreFileNotFoundOnIncremental>
<overWrite>true</overWrite>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
......@@ -187,10 +261,25 @@
<resource>
<targetPath>/config</targetPath>
<directory>${project.basedir}/../config-files</directory>
<excludes>
<exclude>resources/**/*</exclude>
</excludes>
</resource>
<resource>
<!--<resource>
<targetPath>/resources</targetPath>
<directory>${project.basedir}/../config-files/resources</directory>
</resource>-->
<resource>
<targetPath>/resources</targetPath>
<directory>${project.build.directory}</directory>
<include>baguette-client.tgz</include>
<include>baguette-client.tgz.md5</include>
<include>install.sh</include>
</resource>
<resource>
<targetPath>/resources</targetPath>
<directory>${project.basedir}/src/main/resources/public</directory>
<include>*</include>
</resource>
</resources>
</configuration>
......
......@@ -10,8 +10,8 @@
FROM java:8-alpine
ENV BASEDIR /opt/ems-server
#ENV MELODIC_CONFIG_DIR ${BASEDIR}/config
#ENV PAASAGE_CONFIG_DIR ${BASEDIR}/config
ENV MELODIC_CONFIG_DIR ${BASEDIR}/config
ENV PAASAGE_CONFIG_DIR ${BASEDIR}/config
ENV JAR_PATH ${BASEDIR}/jars
WORKDIR ${BASEDIR}
......@@ -23,7 +23,6 @@ ADD config ./config
ADD resources ./resources
RUN mkdir logs
RUN bash -c 'touch jars/*.jar'
RUN bash -c 'chmod +rx ./bin/*.sh'
ENTRYPOINT ["./bin/run.sh"]
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment