Skip to content

Commit

Permalink
Merge branch 'refactoring' into vaadin
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
#	build.gradle.kts
#	src/deploy/docker/.values
  • Loading branch information
Andreas Mautsch committed Dec 10, 2023
2 parents aff167b + 39f8ee1 commit 4e1d9bd
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
go to /src/deploy/docker and do "./stack up" or "./stack up -native"

# run jvm multi image
docker run --pull always --name core-service --rm -p50800:50800 goafabric/core-service:1.1.0-vaadin-SNAPSHOT
docker run --pull always --name core-service --rm -p50800:50800 goafabric/core-service:1.2.0-vaadin-SNAPSHOT

# run native image
docker run --pull always --name core-service-native --rm -p50800:50800 goafabric/core-service-native:1.1.0-vaadin-SNAPSHOT -Xmx64m
docker run --pull always --name core-service-native --rm -p50800:50800 goafabric/core-service-native:1.2.0-vaadin-SNAPSHOT -Xmx64m

# run native image arm
docker run --pull always --name core-service-native --rm -p50800:50800 goafabric/core-service-native-arm64v8:1.1.0-vaadin-SNAPSHOT -Xmx64m
docker run --pull always --name core-service-native --rm -p50800:50800 goafabric/core-service-native-arm64v8:1.2.0-vaadin-SNAPSHOT -Xmx64m

# auth-server
docker run --name auth-server --rm -p30200:30200 goafabric/spring-auth-server-native:1.0.2 -Xmx32m
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.springframework.boot.gradle.tasks.bundling.BootBuildImage

group = "org.goafabric"
version = "1.1.0-vaadin-SNAPSHOT"
version = "1.2.0-vaadin-SNAPSHOT"
java.sourceCompatibility = JavaVersion.VERSION_17

val dockerRegistry = "goafabric"
Expand Down
2 changes: 1 addition & 1 deletion doc/release-notes.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 1.1.0
# 1.2.0
- upgrade to spring boot 3.2.0

# 1.0.5
Expand Down
2 changes: 1 addition & 1 deletion src/deploy/docker/.values
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
_Values_root_name="core-service"

_Values_image_repository=goafabric/core-service
_Values_image_tag=1.1.0-vaadin-SNAPSHOT
_Values_image_tag=1.2.0-vaadin-SNAPSHOT

_Values_service_port=50800
_Values_resources_entrypoint="java -Xms256M -Xmx256M -cp /app/resources:/app/classes:/app/libs/* org.goafabric.core.Application"
Expand Down

0 comments on commit 4e1d9bd

Please sign in to comment.