Add time zone

mfvanek · Nov 6, 2024 · 42af72c · 42af72c
1 parent 0be8242
commit 42af72c
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -35,29 +35,44 @@ curl http://localhost:8080/api/employee/all
 ```
 
 ## Run locally
-```shell
-mvn spring-boot:run -Dspring-boot.run.profiles=extern
+
+### With database from Testcontainers
+
+```
+mvn spring-boot:run -Dspring-boot.run.profiles=local -Dspring-boot.run.jvmArguments="-Duser.timezone=Europe/Moscow"
+```
+
+### With external database
+
+```
+mvn spring-boot:run -Dspring-boot.run.profiles=extern -Dspring-boot.run.jvmArguments="-Duser.timezone=Europe/Moscow"
 ```
 
 ## Run in Docker
+
 ### Build image
-```shell
+
+```
 mvn clean spring-boot:build-image -DskipTests -DskipSpotbugs=true
 ```
 
 ### Build native image
+
 **_Unfortunately, built application doesn't start in container_**
-```shell
+```
 mvn clean spring-boot:build-image -DskipTests -DskipSpotbugs=true -Pnative
 ```
 
 ### Docker Compose
+
 #### Start
+
 ```shell
 docker-compose --project-name="salary-calc" up -d
 ```
 
 #### Stop
+
 ```shell
 docker-compose --project-name="salary-calc" down
 ```
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -59,9 +59,10 @@ services:
 
     salary-calc:
         container_name: salary_calc_container
-        image: docker.io/mfvanek/salary.calc:0.4.3
+        image: docker.io/mfvanek/salary.calc:0.4.7
         environment:
             SPRING_PROFILES_ACTIVE: "docker"
+            TZ: Europe/Moscow
         ports:
             - "8080:8080"
             - "8090:8090"
@@ -73,7 +74,7 @@ services:
             resources:
                 limits:
                     cpus: '0.5'
-                    memory: 512M
+                    memory: 768M
         networks:
             - postgres
 

diff --git a/pom.xml b/pom.xml
@@ -176,7 +176,9 @@
                     <target>${java.version}</target>
                     <compilerArgs>
                         <arg>-XDcompilePolicy=simple</arg>
-                        <arg>-Xplugin:ErrorProne -XepDisableWarningsInGeneratedCode -Xep:MissingSummary:OFF -Xep:FutureReturnValueIgnored:OFF -Xep:TruthSelfEquals:OFF</arg>
+                        <arg>-Xplugin:ErrorProne -XepDisableWarningsInGeneratedCode -Xep:MissingSummary:OFF
+                            -Xep:FutureReturnValueIgnored:OFF -Xep:TruthSelfEquals:OFF
+                        </arg>
                     </compilerArgs>
                     <showWarnings>true</showWarnings>
                     <failOnWarning>true</failOnWarning>
@@ -333,6 +335,9 @@
                 <configuration>
                     <image>
                         <name>mfvanek/${project.artifactId}:${project.version}</name>
+                        <env>
+                            <BP_JVM_VERSION>${java.version}</BP_JVM_VERSION>
+                        </env>
                     </image>
                     <excludes>
                         <exclude>

diff --git a/src/main/java/com/mfvanek/salary/calc/config/ClockConfig.java b/src/main/java/com/mfvanek/salary/calc/config/ClockConfig.java
@@ -4,12 +4,13 @@
 import org.springframework.context.annotation.Configuration;
 
 import java.time.Clock;
+import java.time.ZoneId;
 
 @Configuration(proxyBeanMethods = false)
 public class ClockConfig {
 
     @Bean
     public Clock clock() {
-        return Clock.systemUTC();
+        return Clock.system(ZoneId.systemDefault());
     }
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -30,6 +30,9 @@ spring:
             connection-timeout: 1000 # 1 second
             maximum-pool-size: 5
 
+user:
+    timezone: "Europe/Moscow"
+
 server:
     port: 8080
     servlet: