Skip to content

Commit

Permalink
#149 Release 1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
loreV committed Jan 25, 2022
1 parent d77bc1e commit 5909bfe
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ FROM openjdk:8u201-jdk-alpine3.9

WORKDIR ./home

COPY ./backend/target/backend-2.0-SNAPSHOT.jar .
COPY ./backend/target/backend-1.2.jar .
COPY ./docker/application.properties .

RUN mkdir -p ./deployment ./tmp ./logs

CMD ["java", "-jar", "./backend-2.0-SNAPSHOT.jar", "--spring.config.location=file:///home/application.properties"]
CMD ["java", "-jar", "./backend-1.2.jar", "--spring.config.location=file:///home/application.properties"]

EXPOSE 8990
8 changes: 4 additions & 4 deletions backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<parent>
<groupId>org.sec</groupId>
<artifactId>root</artifactId>
<version>2.0-SNAPSHOT</version>
<version>1.2</version>
<relativePath>../root</relativePath>
</parent>

<artifactId>backend</artifactId>
<version>2.0-SNAPSHOT</version>
<version>1.2</version>

<properties>
<java.version>1.8</java.version>
Expand All @@ -26,12 +26,12 @@
<dependency>
<groupId>org.sec</groupId>
<artifactId>rest</artifactId>
<version>2.0-SNAPSHOT</version>
<version>1.2</version>
</dependency>
<dependency>
<groupId>org.sec</groupId>
<artifactId>data</artifactId>
<version>2.0-SNAPSHOT</version>
<version>1.2</version>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
public class AppProperties {

public static final String APP_NAME = "Sentieri&Cartografia";
public static final String VERSION = "1.0";
public static final String VERSION = "1.2";
public static final String LOCAL_IP_ADDRESS = "127.0.0.1";

private final String port;
Expand Down
2 changes: 1 addition & 1 deletion backend/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ temp.storage.path=/your/path/to/temp
# Open API
springdoc.swagger-ui.path=/api-ui.html
springdoc.api-docs.path=/api-docs
springdoc.info.version=1.0-SNAPSHOT
springdoc.info.version=1.2

# Email
spring.mail.protocol=smtp
Expand Down
2 changes: 1 addition & 1 deletion docker/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ logging.file.name=/home/logs
# Open API
springdoc.swagger-ui.path=/api-ui.html
springdoc.api-docs.path=/api-docs
springdoc.info.version=1.0-SNAPSHOT
springdoc.info.version=1.3

# Email
spring.mail.protocol=smtp
Expand Down
2 changes: 1 addition & 1 deletion docker/build.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/usr/bin/env bash
docker build -t 'sec/backend-2.0-SNAPSHOT' .
docker build -t 'sec/backend-1.2' .
2 changes: 1 addition & 1 deletion docker/docker-compose.cluster.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3.0'
services:
sec_backend:
image: "sec/backend-2.0-SNAPSHOT"
image: "sec/backend-1.2"
ports:
- "8990:8990"
restart: always
Expand Down
2 changes: 1 addition & 1 deletion root/data/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>root</artifactId>
<groupId>org.sec</groupId>
<version>2.0-SNAPSHOT</version>
<version>1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion root/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<groupId>org.sec</groupId>
<artifactId>root</artifactId>
<version>2.0-SNAPSHOT</version>
<version>1.2</version>
<name>Sentieri e Cartografia</name>
<description>Sentieri e Cartografia root pom</description>
<packaging>pom</packaging>
Expand Down
4 changes: 2 additions & 2 deletions root/rest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>root</artifactId>
<groupId>org.sec</groupId>
<version>2.0-SNAPSHOT</version>
<version>1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -15,7 +15,7 @@
<dependency>
<groupId>org.sec</groupId>
<artifactId>data</artifactId>
<version>2.0-SNAPSHOT</version>
<version>1.2</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
Expand Down

0 comments on commit 5909bfe

Please sign in to comment.