From be869032d89989ce81af6391e94ebf934bc236a0 Mon Sep 17 00:00:00 2001 From: gaverianov Date: Fri, 1 Jul 2022 15:18:46 +0300 Subject: [PATCH 1/9] added dockerfiles --- avatarsDicebear/Dockerfile | 7 +++++++ build.gradle.kts | 5 ++--- businessPeople/Dockerfile | 7 +++++++ .../com/stringconcat/people/businessPeople/Person.kt | 8 ++------ persistence/Dockerfile | 7 +++++++ .../stringconcat/people/persistance/model/PersonEntity.kt | 6 +++--- presentation/Dockerfile | 7 +++++++ .../presentation/model/PersonRespectfullViewModel.kt | 2 +- quoteGarden/Dockerfile | 7 +++++++ .../kotlin/com/stringconcat/people/PeopleApplication.kt | 2 -- useCasePeople/Dockerfile | 7 +++++++ .../com/stringconcat/people/useCasePeople/MeUseCase.kt | 4 ++-- 12 files changed, 52 insertions(+), 17 deletions(-) create mode 100644 avatarsDicebear/Dockerfile create mode 100644 businessPeople/Dockerfile create mode 100644 persistence/Dockerfile create mode 100644 presentation/Dockerfile create mode 100644 quoteGarden/Dockerfile create mode 100644 useCasePeople/Dockerfile diff --git a/avatarsDicebear/Dockerfile b/avatarsDicebear/Dockerfile new file mode 100644 index 0000000..3367bc6 --- /dev/null +++ b/avatarsDicebear/Dockerfile @@ -0,0 +1,7 @@ +FROM openjdk:11-jdk-alpine +RUN addgroup -S spring && adduser -S spring -G spring +USER spring:spring +EXPOSE 8080 +ARG JAR_FILE=build/libs/*.jar +COPY ${JAR_FILE} avatarsDicebear.jar +ENTRYPOINT ["java", "-jar", "/avatarsDicebear.jar"] \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 6f11dc9..7267b31 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,7 +14,6 @@ allprojects { repositories { mavenCentral() - jcenter() maven { url = uri("https://repo.spring.io/milestone") } maven { url = uri("https://repo.spring.io/snapshot") } } @@ -30,7 +29,7 @@ allprojects { java.sourceCompatibility = JavaVersion.VERSION_1_8 -val developmentOnly by configurations.creating +val developmentOnly: Configuration by configurations.creating configurations { runtimeClasspath { extendsFrom(developmentOnly) @@ -59,7 +58,7 @@ dependencies { // dev tools developmentOnly("org.springframework.boot:spring-boot-devtools") - //persistance + //persistence implementation("org.postgresql:postgresql:42.3.4") implementation("org.liquibase:liquibase-core:4.9.1") diff --git a/businessPeople/Dockerfile b/businessPeople/Dockerfile new file mode 100644 index 0000000..36934a6 --- /dev/null +++ b/businessPeople/Dockerfile @@ -0,0 +1,7 @@ +FROM openjdk:11-jdk-alpine +RUN addgroup -S spring && adduser -S spring -G spring +USER spring:spring +EXPOSE 8080 +ARG JAR_FILE=build/libs/*.jar +COPY ${JAR_FILE} businessPeople.jar +ENTRYPOINT ["java", "-jar", "/businessPeople.jar"] \ No newline at end of file diff --git a/businessPeople/src/main/kotlin/com/stringconcat/people/businessPeople/Person.kt b/businessPeople/src/main/kotlin/com/stringconcat/people/businessPeople/Person.kt index 09ab035..4a62b1e 100644 --- a/businessPeople/src/main/kotlin/com/stringconcat/people/businessPeople/Person.kt +++ b/businessPeople/src/main/kotlin/com/stringconcat/people/businessPeople/Person.kt @@ -12,14 +12,10 @@ data class Person( val secondName: String, val birthDate: LocalDate, val sex: Sex, - var avatartUrl: String = DEFAULT_ROBOT_AVATAR, + var avatarUrl: String = DEFAULT_ROBOT_AVATAR, val favoriteQuote: String ) { - fun mature(forDate: LocalDate = LocalDate.now()): Boolean = - age(forDate) > 40 - - fun age(forDate: LocalDate = LocalDate.now()): Year = Period.between(forDate, birthDate).years @@ -28,7 +24,7 @@ data class Person( } fun changeAvatar(pictureUrl: String) { - avatartUrl = pictureUrl + avatarUrl = pictureUrl } } diff --git a/persistence/Dockerfile b/persistence/Dockerfile new file mode 100644 index 0000000..87d6a39 --- /dev/null +++ b/persistence/Dockerfile @@ -0,0 +1,7 @@ +FROM openjdk:11-jdk-alpine +RUN addgroup -S spring && adduser -S spring -G spring +USER spring:spring +EXPOSE 8080 +ARG JAR_FILE=build/libs/*.jar +COPY ${JAR_FILE} persistence.jar +ENTRYPOINT ["java", "-jar", "/persistence.jar"] \ No newline at end of file diff --git a/persistence/src/main/kotlin/com/stringconcat/people/persistance/model/PersonEntity.kt b/persistence/src/main/kotlin/com/stringconcat/people/persistance/model/PersonEntity.kt index 66e7d9f..c5e2b03 100644 --- a/persistence/src/main/kotlin/com/stringconcat/people/persistance/model/PersonEntity.kt +++ b/persistence/src/main/kotlin/com/stringconcat/people/persistance/model/PersonEntity.kt @@ -13,7 +13,7 @@ data class PersonEntity( val secondName: String, val birthDate: LocalDate, val sex: Sex, - val avatartUrl: String, + val avatarUrl: String, val favoriteQuote: String ) { enum class Sex { @@ -28,7 +28,7 @@ data class PersonEntity( secondName = p.secondName, birthDate = p.birthDate, sex = if (p.sex == Person.Sex.MAN) Sex.MAN else Sex.WOMAN, - avatartUrl = p.avatartUrl, + avatarUrl = p.avatarUrl, favoriteQuote = p.favoriteQuote ) @@ -39,7 +39,7 @@ data class PersonEntity( secondName = p.secondName, birthDate = p.birthDate, sex = if (p.sex == Sex.MAN) Person.Sex.MAN else Person.Sex.WOMAN, - avatartUrl = p.avatartUrl, + avatarUrl = p.avatarUrl, favoriteQuote = p.favoriteQuote ) } diff --git a/presentation/Dockerfile b/presentation/Dockerfile new file mode 100644 index 0000000..ad454d7 --- /dev/null +++ b/presentation/Dockerfile @@ -0,0 +1,7 @@ +FROM openjdk:11-jdk-alpine +RUN addgroup -S spring && adduser -S spring -G spring +USER spring:spring +EXPOSE 8080 +ARG JAR_FILE=build/libs/*.jar +COPY ${JAR_FILE} presentation.jar +ENTRYPOINT ["java", "-jar", "/presentation.jar"] \ No newline at end of file diff --git a/presentation/src/main/kotlin/com/stringconcat/people/presentation/model/PersonRespectfullViewModel.kt b/presentation/src/main/kotlin/com/stringconcat/people/presentation/model/PersonRespectfullViewModel.kt index 82ed31b..0b6f594 100644 --- a/presentation/src/main/kotlin/com/stringconcat/people/presentation/model/PersonRespectfullViewModel.kt +++ b/presentation/src/main/kotlin/com/stringconcat/people/presentation/model/PersonRespectfullViewModel.kt @@ -18,7 +18,7 @@ class PersonRespectfullViewModel( else "" - fun avatarUrl() = person.avatartUrl + fun avatarUrl() = person.avatarUrl fun birthDate() = "${person.birthDate.dayOfMonth} ${person.birthDate.month} ${person.birthDate.year}" diff --git a/quoteGarden/Dockerfile b/quoteGarden/Dockerfile new file mode 100644 index 0000000..b6519eb --- /dev/null +++ b/quoteGarden/Dockerfile @@ -0,0 +1,7 @@ +FROM openjdk:11-jdk-alpine +RUN addgroup -S spring && adduser -S spring -G spring +USER spring:spring +EXPOSE 8080 +ARG JAR_FILE=build/libs/*.jar +COPY ${JAR_FILE} quoteGarden.jar +ENTRYPOINT ["java", "-jar", "/quoteGarden.jar"] \ No newline at end of file diff --git a/src/main/kotlin/com/stringconcat/people/PeopleApplication.kt b/src/main/kotlin/com/stringconcat/people/PeopleApplication.kt index d619440..0e0f1eb 100644 --- a/src/main/kotlin/com/stringconcat/people/PeopleApplication.kt +++ b/src/main/kotlin/com/stringconcat/people/PeopleApplication.kt @@ -2,10 +2,8 @@ package com.stringconcat.people import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.boot.runApplication -import org.springframework.context.annotation.ComponentScan @SpringBootApplication -@ComponentScan(value = ["com.stringconcat.people"]) class PeopleApplication fun main(args: Array) { diff --git a/useCasePeople/Dockerfile b/useCasePeople/Dockerfile new file mode 100644 index 0000000..3301591 --- /dev/null +++ b/useCasePeople/Dockerfile @@ -0,0 +1,7 @@ +FROM openjdk:11-jdk-alpine +RUN addgroup -S spring && adduser -S spring -G spring +USER spring:spring +EXPOSE 8080 +ARG JAR_FILE=build/libs/*.jar +COPY ${JAR_FILE} useCasePeople.jar +ENTRYPOINT ["java", "-jar", "/useCasePeople.jar"] diff --git a/useCasePeople/src/main/kotlin/com/stringconcat/people/useCasePeople/MeUseCase.kt b/useCasePeople/src/main/kotlin/com/stringconcat/people/useCasePeople/MeUseCase.kt index b83063d..5125187 100644 --- a/useCasePeople/src/main/kotlin/com/stringconcat/people/useCasePeople/MeUseCase.kt +++ b/useCasePeople/src/main/kotlin/com/stringconcat/people/useCasePeople/MeUseCase.kt @@ -12,12 +12,12 @@ class MeUseCase( operator fun invoke(): Person { val id = UUID.fromString("29f4d7e3-fd7c-4664-ad07-763326215ec4") val me = Person( - id = UUID.fromString("29f4d7e3-fd7c-4664-ad07-763326215ec4"), + id = id, firstName = "Sergey", secondName = "Bukharov", birthDate = LocalDate.of(1987,12,1), sex = Person.Sex.MAN, - avatartUrl = "https://avatars.dicebear.com/v2/male/my-somffething.svg", + avatarUrl = "https://avatars.dicebear.com/v2/male/my-somffething.svg", favoriteQuote = "make the easy things easy, and the hard things possible" ) persistPerson.persist(me) From 339815280f55fadccfd05926a0c491121fc87d6d Mon Sep 17 00:00:00 2001 From: gaverianov Date: Fri, 1 Jul 2022 15:54:30 +0300 Subject: [PATCH 2/9] added buildImage files --- avatarsDicebear/buildImage.sh | 22 ++++++++++++++++++++++ businessPeople/buildImage.sh | 22 ++++++++++++++++++++++ persistence/buildImage.sh | 22 ++++++++++++++++++++++ presentation/buildImage.sh | 22 ++++++++++++++++++++++ quoteGarden/buildImage.sh | 22 ++++++++++++++++++++++ useCasePeople/buildImage.sh | 22 ++++++++++++++++++++++ 6 files changed, 132 insertions(+) create mode 100644 avatarsDicebear/buildImage.sh create mode 100644 businessPeople/buildImage.sh create mode 100644 persistence/buildImage.sh create mode 100644 presentation/buildImage.sh create mode 100644 quoteGarden/buildImage.sh create mode 100644 useCasePeople/buildImage.sh diff --git a/avatarsDicebear/buildImage.sh b/avatarsDicebear/buildImage.sh new file mode 100644 index 0000000..2d854cc --- /dev/null +++ b/avatarsDicebear/buildImage.sh @@ -0,0 +1,22 @@ +#!/bin/bash +set -e +imageTag=$1 + +if [ -z "$1" ]; + then + echo No image tag provided. Latest will be used + imageTag=latest +fi +repositoryName=usecasepeople +imageFullName=$repositoryName:$imageTag + +echo [Avatars DiceBear STARTING] building $imageFullName + +echo [Avatars DiceBear] creating jar... +(exec "${BASH_SOURCE%/*}/../gradlew" bootJar -no-daemon) + +echo [Avatars DiceBear] creating docker image... +docker build -t $imageFullName "${BASH_SOURCE%/*}" + +echo [Avatars DiceBear FINISHED] image has been built + diff --git a/businessPeople/buildImage.sh b/businessPeople/buildImage.sh new file mode 100644 index 0000000..f8dff67 --- /dev/null +++ b/businessPeople/buildImage.sh @@ -0,0 +1,22 @@ +#!/bin/bash +set -e +imageTag=$1 + +if [ -z "$1" ]; + then + echo No image tag provided. Latest will be used + imageTag=latest +fi +repositoryName=usecasepeople +imageFullName=$repositoryName:$imageTag + +echo [Business people STARTING] building $imageFullName + +echo [Business people] creating jar... +(exec "${BASH_SOURCE%/*}/../gradlew" bootJar -no-daemon) + +echo [Business people] creating docker image... +docker build -t $imageFullName "${BASH_SOURCE%/*}" + +echo [Business people FINISHED] image has been built + diff --git a/persistence/buildImage.sh b/persistence/buildImage.sh new file mode 100644 index 0000000..c106a7c --- /dev/null +++ b/persistence/buildImage.sh @@ -0,0 +1,22 @@ +#!/bin/bash +set -e +imageTag=$1 + +if [ -z "$1" ]; + then + echo No image tag provided. Latest will be used + imageTag=latest +fi +repositoryName=usecasepeople +imageFullName=$repositoryName:$imageTag + +echo [Persistence STARTING] building $imageFullName + +echo [Persistence ] creating jar... +(exec "${BASH_SOURCE%/*}/../gradlew" bootJar -no-daemon) + +echo [Persistence ] creating docker image... +docker build -t $imageFullName "${BASH_SOURCE%/*}" + +echo [Persistence FINISHED] image has been built + diff --git a/presentation/buildImage.sh b/presentation/buildImage.sh new file mode 100644 index 0000000..71e37b2 --- /dev/null +++ b/presentation/buildImage.sh @@ -0,0 +1,22 @@ +#!/bin/bash +set -e +imageTag=$1 + +if [ -z "$1" ]; + then + echo No image tag provided. Latest will be used + imageTag=latest +fi +repositoryName=usecasepeople +imageFullName=$repositoryName:$imageTag + +echo [Presentation STARTING] building $imageFullName + +echo [Presentation ] creating jar... +(exec "${BASH_SOURCE%/*}/../gradlew" bootJar -no-daemon) + +echo [Presentation ] creating docker image... +docker build -t $imageFullName "${BASH_SOURCE%/*}" + +echo [Presentation FINISHED] image has been built + diff --git a/quoteGarden/buildImage.sh b/quoteGarden/buildImage.sh new file mode 100644 index 0000000..9f166b8 --- /dev/null +++ b/quoteGarden/buildImage.sh @@ -0,0 +1,22 @@ +#!/bin/bash +set -e +imageTag=$1 + +if [ -z "$1" ]; + then + echo No image tag provided. Latest will be used + imageTag=latest +fi +repositoryName=usecasepeople +imageFullName=$repositoryName:$imageTag + +echo [Quote garden STARTING] building $imageFullName + +echo [Quote garden ] creating jar... +(exec "${BASH_SOURCE%/*}/../gradlew" bootJar -no-daemon) + +echo [Quote garden ] creating docker image... +docker build -t $imageFullName "${BASH_SOURCE%/*}" + +echo [Quote garden FINISHED] image has been built + diff --git a/useCasePeople/buildImage.sh b/useCasePeople/buildImage.sh new file mode 100644 index 0000000..ba74dc7 --- /dev/null +++ b/useCasePeople/buildImage.sh @@ -0,0 +1,22 @@ +#!/bin/bash +set -e +imageTag=$1 + +if [ -z "$1" ]; + then + echo No image tag provided. Latest will be used + imageTag=latest +fi +repositoryName=usecasepeople +imageFullName=$repositoryName:$imageTag + +echo [Use case people STARTING] building $imageFullName + +echo [Use case people] creating jar... +(exec "${BASH_SOURCE%/*}/../gradlew" bootJar -no-daemon) + +echo [Use case people] creating docker image... +docker build -t $imageFullName "${BASH_SOURCE%/*}" + +echo [Use case people FINISHED] image has been built + From 3388ffe89f4f33424bffd411df27d5146de51c1e Mon Sep 17 00:00:00 2001 From: gaverianov Date: Fri, 1 Jul 2022 16:07:21 +0300 Subject: [PATCH 3/9] added push image files --- avatarsDicebear/buildImage.sh | 2 +- avatarsDicebear/pushImage.sh | 20 ++++++++++++++++++++ businessPeople/buildImage.sh | 2 +- businessPeople/pushImage.sh | 20 ++++++++++++++++++++ persistence/buildImage.sh | 2 +- persistence/pushImage.sh | 20 ++++++++++++++++++++ presentation/buildImage.sh | 2 +- presentation/pushImage.sh | 20 ++++++++++++++++++++ quoteGarden/buildImage.sh | 2 +- quoteGarden/pushImage.sh | 20 ++++++++++++++++++++ useCasePeople/buildImage.sh | 4 ++-- useCasePeople/pushImage.sh | 20 ++++++++++++++++++++ 12 files changed, 127 insertions(+), 7 deletions(-) create mode 100644 avatarsDicebear/pushImage.sh create mode 100644 businessPeople/pushImage.sh create mode 100644 persistence/pushImage.sh create mode 100644 presentation/pushImage.sh create mode 100644 quoteGarden/pushImage.sh create mode 100644 useCasePeople/pushImage.sh diff --git a/avatarsDicebear/buildImage.sh b/avatarsDicebear/buildImage.sh index 2d854cc..76d9693 100644 --- a/avatarsDicebear/buildImage.sh +++ b/avatarsDicebear/buildImage.sh @@ -7,7 +7,7 @@ if [ -z "$1" ]; echo No image tag provided. Latest will be used imageTag=latest fi -repositoryName=usecasepeople +repositoryName=avatars_dicebear imageFullName=$repositoryName:$imageTag echo [Avatars DiceBear STARTING] building $imageFullName diff --git a/avatarsDicebear/pushImage.sh b/avatarsDicebear/pushImage.sh new file mode 100644 index 0000000..f9524bf --- /dev/null +++ b/avatarsDicebear/pushImage.sh @@ -0,0 +1,20 @@ +#!/bin/bash +set -e +imageTag=$1 + +if [ -z "$1" ]; + then + echo No image tag provided. Latest will be used + imageTag=latest +fi +repositoryName=avatars_decebear +imageFullName=$repositoryName:$imageTag + +echo [Avatars decebear STARTING] pushing image $imageFullName + +echo [Avatars decebear ] pushing image... + +echo [Avatars decebear ] creating docker image... +docker push $imageFullName + +echo [Avatars decebear FINISHED] image $imageFullName pushed \ No newline at end of file diff --git a/businessPeople/buildImage.sh b/businessPeople/buildImage.sh index f8dff67..023def6 100644 --- a/businessPeople/buildImage.sh +++ b/businessPeople/buildImage.sh @@ -7,7 +7,7 @@ if [ -z "$1" ]; echo No image tag provided. Latest will be used imageTag=latest fi -repositoryName=usecasepeople +repositoryName=business_image imageFullName=$repositoryName:$imageTag echo [Business people STARTING] building $imageFullName diff --git a/businessPeople/pushImage.sh b/businessPeople/pushImage.sh new file mode 100644 index 0000000..44e45eb --- /dev/null +++ b/businessPeople/pushImage.sh @@ -0,0 +1,20 @@ +#!/bin/bash +set -e +imageTag=$1 + +if [ -z "$1" ]; + then + echo No image tag provided. Latest will be used + imageTag=latest +fi +repositoryName=business_people +imageFullName=$repositoryName:$imageTag + +echo [Business people STARTING] pushing image $imageFullName + +echo [Business people ] pushing image... + +echo [Business people ] creating docker image... +docker push $imageFullName + +echo [Business people FINISHED] image $imageFullName pushed \ No newline at end of file diff --git a/persistence/buildImage.sh b/persistence/buildImage.sh index c106a7c..f4f5b76 100644 --- a/persistence/buildImage.sh +++ b/persistence/buildImage.sh @@ -7,7 +7,7 @@ if [ -z "$1" ]; echo No image tag provided. Latest will be used imageTag=latest fi -repositoryName=usecasepeople +repositoryName=persistence imageFullName=$repositoryName:$imageTag echo [Persistence STARTING] building $imageFullName diff --git a/persistence/pushImage.sh b/persistence/pushImage.sh new file mode 100644 index 0000000..5f6b0d7 --- /dev/null +++ b/persistence/pushImage.sh @@ -0,0 +1,20 @@ +#!/bin/bash +set -e +imageTag=$1 + +if [ -z "$1" ]; + then + echo No image tag provided. Latest will be used + imageTag=latest +fi +repositoryName=persistence +imageFullName=$repositoryName:$imageTag + +echo [Persistence STARTING] pushing image $imageFullName + +echo [Persistence ] pushing image... + +echo [Persistence ] creating docker image... +docker push $imageFullName + +echo [Persistence FINISHED] image $imageFullName pushed \ No newline at end of file diff --git a/presentation/buildImage.sh b/presentation/buildImage.sh index 71e37b2..211022b 100644 --- a/presentation/buildImage.sh +++ b/presentation/buildImage.sh @@ -7,7 +7,7 @@ if [ -z "$1" ]; echo No image tag provided. Latest will be used imageTag=latest fi -repositoryName=usecasepeople +repositoryName=presentation imageFullName=$repositoryName:$imageTag echo [Presentation STARTING] building $imageFullName diff --git a/presentation/pushImage.sh b/presentation/pushImage.sh new file mode 100644 index 0000000..90f9768 --- /dev/null +++ b/presentation/pushImage.sh @@ -0,0 +1,20 @@ +#!/bin/bash +set -e +imageTag=$1 + +if [ -z "$1" ]; + then + echo No image tag provided. Latest will be used + imageTag=latest +fi +repositoryName=presentation +imageFullName=$repositoryName:$imageTag + +echo [Presentation STARTING] pushing image $imageFullName + +echo [Presentation ] pushing image... + +echo [Presentation ] creating docker image... +docker push $imageFullName + +echo [Presentation FINISHED] image $imageFullName pushed \ No newline at end of file diff --git a/quoteGarden/buildImage.sh b/quoteGarden/buildImage.sh index 9f166b8..b2fdfaa 100644 --- a/quoteGarden/buildImage.sh +++ b/quoteGarden/buildImage.sh @@ -7,7 +7,7 @@ if [ -z "$1" ]; echo No image tag provided. Latest will be used imageTag=latest fi -repositoryName=usecasepeople +repositoryName=quote_garden imageFullName=$repositoryName:$imageTag echo [Quote garden STARTING] building $imageFullName diff --git a/quoteGarden/pushImage.sh b/quoteGarden/pushImage.sh new file mode 100644 index 0000000..1c4f3dd --- /dev/null +++ b/quoteGarden/pushImage.sh @@ -0,0 +1,20 @@ +#!/bin/bash +set -e +imageTag=$1 + +if [ -z "$1" ]; + then + echo No image tag provided. Latest will be used + imageTag=latest +fi +repositoryName=quote_garden +imageFullName=$repositoryName:$imageTag + +echo [Quote garden STARTING] pushing image $imageFullName + +echo [Quote garden] pushing image... + +echo [Quote garden] creating docker image... +docker push $imageFullName + +echo [Quote garden FINISHED] image $imageFullName pushed \ No newline at end of file diff --git a/useCasePeople/buildImage.sh b/useCasePeople/buildImage.sh index ba74dc7..64edefd 100644 --- a/useCasePeople/buildImage.sh +++ b/useCasePeople/buildImage.sh @@ -15,8 +15,8 @@ echo [Use case people STARTING] building $imageFullName echo [Use case people] creating jar... (exec "${BASH_SOURCE%/*}/../gradlew" bootJar -no-daemon) -echo [Use case people] creating docker image... +echo [Use case people] creating docker image $imageFullName... docker build -t $imageFullName "${BASH_SOURCE%/*}" -echo [Use case people FINISHED] image has been built +echo [Use case people FINISHED] image $imageFullName has been built diff --git a/useCasePeople/pushImage.sh b/useCasePeople/pushImage.sh new file mode 100644 index 0000000..7b9d903 --- /dev/null +++ b/useCasePeople/pushImage.sh @@ -0,0 +1,20 @@ +#!/bin/bash +set -e +imageTag=$1 + +if [ -z "$1" ]; + then + echo No image tag provided. Latest will be used + imageTag=latest +fi +repositoryName=usecasepeople +imageFullName=$repositoryName:$imageTag + +echo [Use case people STARTING] pushing image $imageFullName + +echo [Use case people] pushing image... + +echo [Use case people] creating docker image... +docker push $imageFullName + +echo [Use case people FINISHED] image $imageFullName pushed \ No newline at end of file From 634ffcf04a4333f2beb79f82c92a91742e441132 Mon Sep 17 00:00:00 2001 From: gaverianov Date: Fri, 1 Jul 2022 16:12:28 +0300 Subject: [PATCH 4/9] added build image file in global project --- buildImage.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 buildImage.sh diff --git a/buildImage.sh b/buildImage.sh new file mode 100644 index 0000000..c015321 --- /dev/null +++ b/buildImage.sh @@ -0,0 +1,16 @@ +#!/bin/bash +set -e +imageTag=$1 + +if [ -z "$1" ]; + then + echo No image tag provided. Latest will be used + imageTag=latest +fi + +(exec "${BASH_SOURCE%/*}/avatarsDicebear/buildImage.sh" $imageTag) +(exec "${BASH_SOURCE%/*}/businessPeople/buildImage.sh" $imageTag) +(exec "${BASH_SOURCE%/*}/persistence/buildImage.sh" $imageTag) +(exec "${BASH_SOURCE%/*}/presentation/buildImage.sh" $imageTag) +(exec "${BASH_SOURCE%/*}/quoteGarden/buildImage.sh" $imageTag) +(exec "${BASH_SOURCE%/*}/useCasePeople/buildImage.sh" $imageTag) From e2dcd070a526fe0d2d5f50db8c6c66fac4743c47 Mon Sep 17 00:00:00 2001 From: gaverianov Date: Fri, 1 Jul 2022 16:13:50 +0300 Subject: [PATCH 5/9] added push image file in global project --- pushImage.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 pushImage.sh diff --git a/pushImage.sh b/pushImage.sh new file mode 100644 index 0000000..659de3d --- /dev/null +++ b/pushImage.sh @@ -0,0 +1,16 @@ +#!/bin/bash +set -e +imageTag=$1 + +if [ -z "$1" ]; + then + echo No image tag provided. Latest will be used + imageTag=latest +fi + +(exec "${BASH_SOURCE%/*}/avatarsDicebear/pushImage.sh" $imageTag) +(exec "${BASH_SOURCE%/*}/businessPeople/pushImage.sh" $imageTag) +(exec "${BASH_SOURCE%/*}/persistence/pushImage.sh" $imageTag) +(exec "${BASH_SOURCE%/*}/presentation/pushImage.sh" $imageTag) +(exec "${BASH_SOURCE%/*}/quoteGarden/pushImage.sh" $imageTag) +(exec "${BASH_SOURCE%/*}/useCasePeople/pushImage.sh" $imageTag) \ No newline at end of file From ce34415c5e4a4b9f37592eec1c87674ff2a0a8b8 Mon Sep 17 00:00:00 2001 From: gaverianov Date: Mon, 4 Jul 2022 17:34:26 +0300 Subject: [PATCH 6/9] dependency version updates --- avatarsDicebear/build.gradle.kts | 4 ++-- avatarsDicebear/buildImage.sh | 4 ++-- build.gradle.kts | 6 +++--- businessPeople/build.gradle.kts | 4 ++-- businessPeople/buildImage.sh | 2 +- persistence/build.gradle.kts | 6 +++--- persistence/buildImage.sh | 2 +- presentation/build.gradle.kts | 16 ++++++++-------- presentation/buildImage.sh | 2 +- quoteGarden/build.gradle.kts | 6 +++--- quoteGarden/buildImage.sh | 2 +- useCasePeople/build.gradle.kts | 4 ++-- useCasePeople/buildImage.sh | 2 +- 13 files changed, 30 insertions(+), 30 deletions(-) diff --git a/avatarsDicebear/build.gradle.kts b/avatarsDicebear/build.gradle.kts index 59a9e9c..e85e483 100644 --- a/avatarsDicebear/build.gradle.kts +++ b/avatarsDicebear/build.gradle.kts @@ -12,6 +12,6 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // tests - testCompile("org.junit.jupiter:junit-jupiter-api:5.5.2") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.5.2") + testCompile("org.junit.jupiter:junit-jupiter-api:5.8.2") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2") } \ No newline at end of file diff --git a/avatarsDicebear/buildImage.sh b/avatarsDicebear/buildImage.sh index 76d9693..fe437fd 100644 --- a/avatarsDicebear/buildImage.sh +++ b/avatarsDicebear/buildImage.sh @@ -11,9 +11,9 @@ repositoryName=avatars_dicebear imageFullName=$repositoryName:$imageTag echo [Avatars DiceBear STARTING] building $imageFullName - +echo BASH_SOURCE: "${BASH_SOURCE%/*}" echo [Avatars DiceBear] creating jar... -(exec "${BASH_SOURCE%/*}/../gradlew" bootJar -no-daemon) +(exec "${BASH_SOURCE%/*}/../gradlew" bootJar --no-daemon) echo [Avatars DiceBear] creating docker image... docker build -t $imageFullName "${BASH_SOURCE%/*}" diff --git a/build.gradle.kts b/build.gradle.kts index 7267b31..343f0c2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -29,7 +29,7 @@ allprojects { java.sourceCompatibility = JavaVersion.VERSION_1_8 -val developmentOnly: Configuration by configurations.creating +val developmentOnly by configurations.creating configurations { runtimeClasspath { extendsFrom(developmentOnly) @@ -59,8 +59,8 @@ dependencies { developmentOnly("org.springframework.boot:spring-boot-devtools") //persistence - implementation("org.postgresql:postgresql:42.3.4") - implementation("org.liquibase:liquibase-core:4.9.1") + implementation("org.postgresql:postgresql:42.3.6") + implementation("org.liquibase:liquibase-core:4.11.0") // tests testCompile("org.junit.jupiter:junit-jupiter-api:5.8.2") diff --git a/businessPeople/build.gradle.kts b/businessPeople/build.gradle.kts index 74cf14c..772b9b8 100644 --- a/businessPeople/build.gradle.kts +++ b/businessPeople/build.gradle.kts @@ -11,6 +11,6 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // tests - testCompile("org.junit.jupiter:junit-jupiter-api:5.5.2") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.5.2") + testCompile("org.junit.jupiter:junit-jupiter-api:5.8.2") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2") } \ No newline at end of file diff --git a/businessPeople/buildImage.sh b/businessPeople/buildImage.sh index 023def6..176afef 100644 --- a/businessPeople/buildImage.sh +++ b/businessPeople/buildImage.sh @@ -13,7 +13,7 @@ imageFullName=$repositoryName:$imageTag echo [Business people STARTING] building $imageFullName echo [Business people] creating jar... -(exec "${BASH_SOURCE%/*}/../gradlew" bootJar -no-daemon) +(exec "${BASH_SOURCE%/*}/../gradlew" bootJar --no-daemon) echo [Business people] creating docker image... docker build -t $imageFullName "${BASH_SOURCE%/*}" diff --git a/persistence/build.gradle.kts b/persistence/build.gradle.kts index 45d9868..0a55f6e 100644 --- a/persistence/build.gradle.kts +++ b/persistence/build.gradle.kts @@ -12,13 +12,13 @@ dependencies { implementation("javax.persistence:javax.persistence-api:2.2") implementation("org.apache.logging.log4j:log4j-core:2.17.2") - implementation("org.springframework.boot:spring-boot-starter-data-jpa:2.2.1.BUILD-SNAPSHOT") + implementation("org.springframework.boot:spring-boot-starter-data-jpa:2.7.1") // kotlin implementation("org.jetbrains.kotlin:kotlin-reflect") implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // tests - testCompile("org.junit.jupiter:junit-jupiter-api:5.5.2") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.5.2") + testCompile("org.junit.jupiter:junit-jupiter-api:5.8.2") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2") } \ No newline at end of file diff --git a/persistence/buildImage.sh b/persistence/buildImage.sh index f4f5b76..ecac2e5 100644 --- a/persistence/buildImage.sh +++ b/persistence/buildImage.sh @@ -13,7 +13,7 @@ imageFullName=$repositoryName:$imageTag echo [Persistence STARTING] building $imageFullName echo [Persistence ] creating jar... -(exec "${BASH_SOURCE%/*}/../gradlew" bootJar -no-daemon) +(exec "${BASH_SOURCE%/*}/../gradlew" bootJar --no-daemon) echo [Persistence ] creating docker image... docker build -t $imageFullName "${BASH_SOURCE%/*}" diff --git a/presentation/build.gradle.kts b/presentation/build.gradle.kts index 0c04bdb..711e97e 100644 --- a/presentation/build.gradle.kts +++ b/presentation/build.gradle.kts @@ -11,24 +11,24 @@ dependencies { implementation(project(":useCasePeople")) // spring modules - implementation("org.springframework.boot:spring-boot-starter-webflux:2.2.1.BUILD-SNAPSHOT") - implementation("org.springframework.boot:spring-boot-starter-data-rest:2.2.1.BUILD-SNAPSHOT") + implementation ("org.springframework.boot:spring-boot-starter-webflux:2.7.1") + implementation("org.springframework.boot:spring-boot-starter-data-rest:2.7.1") // tools - implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.10.0") + implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.13.3") // view - implementation( "org.jetbrains.kotlinx:kotlinx-html-jvm:0.6.12") + implementation( "org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.5") // kotlin implementation("org.jetbrains.kotlin:kotlin-reflect") implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // tests - testCompile("org.junit.jupiter:junit-jupiter-api:5.5.2") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.5.2") - testImplementation("org.springframework.boot:spring-boot-starter-test:2.2.1.BUILD-SNAPSHOT") { + testCompile("org.junit.jupiter:junit-jupiter-api:5.8.2") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2") + testImplementation("org.springframework.boot:spring-boot-starter-test:2.7.0") { exclude(group = "org.junit.vintage", module = "junit-vintage-engine") } - testImplementation("io.projectreactor:reactor-test:3.3.0.RELEASE") + testImplementation("io.projectreactor:reactor-test:3.4.18") } \ No newline at end of file diff --git a/presentation/buildImage.sh b/presentation/buildImage.sh index 211022b..79e66f7 100644 --- a/presentation/buildImage.sh +++ b/presentation/buildImage.sh @@ -13,7 +13,7 @@ imageFullName=$repositoryName:$imageTag echo [Presentation STARTING] building $imageFullName echo [Presentation ] creating jar... -(exec "${BASH_SOURCE%/*}/../gradlew" bootJar -no-daemon) +(exec "${BASH_SOURCE%/*}/../gradlew" bootJar --no-daemon) echo [Presentation ] creating docker image... docker build -t $imageFullName "${BASH_SOURCE%/*}" diff --git a/quoteGarden/build.gradle.kts b/quoteGarden/build.gradle.kts index 62db1a7..81c59dd 100644 --- a/quoteGarden/build.gradle.kts +++ b/quoteGarden/build.gradle.kts @@ -8,13 +8,13 @@ dependencies { implementation(project(":businessPeople")) implementation("javax.inject:javax.inject:1") - implementation("org.springframework:spring-web:5.2.0.RELEASE") + implementation("org.springframework:spring-web:5.3.20") // kotlin implementation("org.jetbrains.kotlin:kotlin-reflect") implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // tests - testCompile("org.junit.jupiter:junit-jupiter-api:5.5.2") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.5.2") + testCompile("org.junit.jupiter:junit-jupiter-api:5.8.2") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2") } \ No newline at end of file diff --git a/quoteGarden/buildImage.sh b/quoteGarden/buildImage.sh index b2fdfaa..8ffa5b3 100644 --- a/quoteGarden/buildImage.sh +++ b/quoteGarden/buildImage.sh @@ -13,7 +13,7 @@ imageFullName=$repositoryName:$imageTag echo [Quote garden STARTING] building $imageFullName echo [Quote garden ] creating jar... -(exec "${BASH_SOURCE%/*}/../gradlew" bootJar -no-daemon) +(exec "${BASH_SOURCE%/*}/../gradlew" bootJar --no-daemon) echo [Quote garden ] creating docker image... docker build -t $imageFullName "${BASH_SOURCE%/*}" diff --git a/useCasePeople/build.gradle.kts b/useCasePeople/build.gradle.kts index d9b9b38..d74c4ef 100644 --- a/useCasePeople/build.gradle.kts +++ b/useCasePeople/build.gradle.kts @@ -14,6 +14,6 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // tests - testCompile("org.junit.jupiter:junit-jupiter-api:5.5.2") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.5.2") + testCompile("org.junit.jupiter:junit-jupiter-api:5.8.2") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2") } \ No newline at end of file diff --git a/useCasePeople/buildImage.sh b/useCasePeople/buildImage.sh index 64edefd..e6cba30 100644 --- a/useCasePeople/buildImage.sh +++ b/useCasePeople/buildImage.sh @@ -13,7 +13,7 @@ imageFullName=$repositoryName:$imageTag echo [Use case people STARTING] building $imageFullName echo [Use case people] creating jar... -(exec "${BASH_SOURCE%/*}/../gradlew" bootJar -no-daemon) +(exec "${BASH_SOURCE%/*}/../gradlew" bootJar --no-daemon) echo [Use case people] creating docker image $imageFullName... docker build -t $imageFullName "${BASH_SOURCE%/*}" From 7632c5e2252939112f06ca91385ac70b3d677e88 Mon Sep 17 00:00:00 2001 From: gaverianov Date: Thu, 7 Jul 2022 10:34:17 +0300 Subject: [PATCH 7/9] Gradle returned to its previous state --- avatarsDicebear/build.gradle.kts | 4 ++-- build.gradle.kts | 7 ++++--- businessPeople/build.gradle.kts | 4 ++-- gradle.properties | 0 persistence/build.gradle.kts | 6 +++--- presentation/build.gradle.kts | 16 ++++++++-------- quoteGarden/build.gradle.kts | 6 +++--- useCasePeople/build.gradle.kts | 4 ++-- 8 files changed, 24 insertions(+), 23 deletions(-) create mode 100644 gradle.properties diff --git a/avatarsDicebear/build.gradle.kts b/avatarsDicebear/build.gradle.kts index e85e483..59a9e9c 100644 --- a/avatarsDicebear/build.gradle.kts +++ b/avatarsDicebear/build.gradle.kts @@ -12,6 +12,6 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // tests - testCompile("org.junit.jupiter:junit-jupiter-api:5.8.2") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2") + testCompile("org.junit.jupiter:junit-jupiter-api:5.5.2") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.5.2") } \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 343f0c2..6f11dc9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,6 +14,7 @@ allprojects { repositories { mavenCentral() + jcenter() maven { url = uri("https://repo.spring.io/milestone") } maven { url = uri("https://repo.spring.io/snapshot") } } @@ -58,9 +59,9 @@ dependencies { // dev tools developmentOnly("org.springframework.boot:spring-boot-devtools") - //persistence - implementation("org.postgresql:postgresql:42.3.6") - implementation("org.liquibase:liquibase-core:4.11.0") + //persistance + implementation("org.postgresql:postgresql:42.3.4") + implementation("org.liquibase:liquibase-core:4.9.1") // tests testCompile("org.junit.jupiter:junit-jupiter-api:5.8.2") diff --git a/businessPeople/build.gradle.kts b/businessPeople/build.gradle.kts index 772b9b8..74cf14c 100644 --- a/businessPeople/build.gradle.kts +++ b/businessPeople/build.gradle.kts @@ -11,6 +11,6 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // tests - testCompile("org.junit.jupiter:junit-jupiter-api:5.8.2") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2") + testCompile("org.junit.jupiter:junit-jupiter-api:5.5.2") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.5.2") } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..e69de29 diff --git a/persistence/build.gradle.kts b/persistence/build.gradle.kts index 0a55f6e..45d9868 100644 --- a/persistence/build.gradle.kts +++ b/persistence/build.gradle.kts @@ -12,13 +12,13 @@ dependencies { implementation("javax.persistence:javax.persistence-api:2.2") implementation("org.apache.logging.log4j:log4j-core:2.17.2") - implementation("org.springframework.boot:spring-boot-starter-data-jpa:2.7.1") + implementation("org.springframework.boot:spring-boot-starter-data-jpa:2.2.1.BUILD-SNAPSHOT") // kotlin implementation("org.jetbrains.kotlin:kotlin-reflect") implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // tests - testCompile("org.junit.jupiter:junit-jupiter-api:5.8.2") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2") + testCompile("org.junit.jupiter:junit-jupiter-api:5.5.2") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.5.2") } \ No newline at end of file diff --git a/presentation/build.gradle.kts b/presentation/build.gradle.kts index 711e97e..0c04bdb 100644 --- a/presentation/build.gradle.kts +++ b/presentation/build.gradle.kts @@ -11,24 +11,24 @@ dependencies { implementation(project(":useCasePeople")) // spring modules - implementation ("org.springframework.boot:spring-boot-starter-webflux:2.7.1") - implementation("org.springframework.boot:spring-boot-starter-data-rest:2.7.1") + implementation("org.springframework.boot:spring-boot-starter-webflux:2.2.1.BUILD-SNAPSHOT") + implementation("org.springframework.boot:spring-boot-starter-data-rest:2.2.1.BUILD-SNAPSHOT") // tools - implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.13.3") + implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.10.0") // view - implementation( "org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.5") + implementation( "org.jetbrains.kotlinx:kotlinx-html-jvm:0.6.12") // kotlin implementation("org.jetbrains.kotlin:kotlin-reflect") implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // tests - testCompile("org.junit.jupiter:junit-jupiter-api:5.8.2") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2") - testImplementation("org.springframework.boot:spring-boot-starter-test:2.7.0") { + testCompile("org.junit.jupiter:junit-jupiter-api:5.5.2") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.5.2") + testImplementation("org.springframework.boot:spring-boot-starter-test:2.2.1.BUILD-SNAPSHOT") { exclude(group = "org.junit.vintage", module = "junit-vintage-engine") } - testImplementation("io.projectreactor:reactor-test:3.4.18") + testImplementation("io.projectreactor:reactor-test:3.3.0.RELEASE") } \ No newline at end of file diff --git a/quoteGarden/build.gradle.kts b/quoteGarden/build.gradle.kts index 81c59dd..62db1a7 100644 --- a/quoteGarden/build.gradle.kts +++ b/quoteGarden/build.gradle.kts @@ -8,13 +8,13 @@ dependencies { implementation(project(":businessPeople")) implementation("javax.inject:javax.inject:1") - implementation("org.springframework:spring-web:5.3.20") + implementation("org.springframework:spring-web:5.2.0.RELEASE") // kotlin implementation("org.jetbrains.kotlin:kotlin-reflect") implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // tests - testCompile("org.junit.jupiter:junit-jupiter-api:5.8.2") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2") + testCompile("org.junit.jupiter:junit-jupiter-api:5.5.2") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.5.2") } \ No newline at end of file diff --git a/useCasePeople/build.gradle.kts b/useCasePeople/build.gradle.kts index d74c4ef..d9b9b38 100644 --- a/useCasePeople/build.gradle.kts +++ b/useCasePeople/build.gradle.kts @@ -14,6 +14,6 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // tests - testCompile("org.junit.jupiter:junit-jupiter-api:5.8.2") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2") + testCompile("org.junit.jupiter:junit-jupiter-api:5.5.2") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.5.2") } \ No newline at end of file From c22d6454fb23ccadbc9cdb45d609af37a140a172 Mon Sep 17 00:00:00 2001 From: gaverianov Date: Tue, 12 Jul 2022 11:42:01 +0300 Subject: [PATCH 8/9] commit --- avatarsDicebear/Dockerfile | 2 +- businessPeople/Dockerfile | 2 +- persistence/Dockerfile | 2 +- presentation/Dockerfile | 2 +- quoteGarden/Dockerfile | 2 +- useCasePeople/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/avatarsDicebear/Dockerfile b/avatarsDicebear/Dockerfile index 3367bc6..27108ad 100644 --- a/avatarsDicebear/Dockerfile +++ b/avatarsDicebear/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:11-jdk-alpine +FROM openjdk:8-jdk-alpine RUN addgroup -S spring && adduser -S spring -G spring USER spring:spring EXPOSE 8080 diff --git a/businessPeople/Dockerfile b/businessPeople/Dockerfile index 36934a6..3a5ddd1 100644 --- a/businessPeople/Dockerfile +++ b/businessPeople/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:11-jdk-alpine +FROM openjdk:8-jdk-alpine RUN addgroup -S spring && adduser -S spring -G spring USER spring:spring EXPOSE 8080 diff --git a/persistence/Dockerfile b/persistence/Dockerfile index 87d6a39..9977cd5 100644 --- a/persistence/Dockerfile +++ b/persistence/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:11-jdk-alpine +FROM openjdk:8-jdk-alpine RUN addgroup -S spring && adduser -S spring -G spring USER spring:spring EXPOSE 8080 diff --git a/presentation/Dockerfile b/presentation/Dockerfile index ad454d7..3fad23a 100644 --- a/presentation/Dockerfile +++ b/presentation/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:11-jdk-alpine +FROM openjdk:8-jdk-alpine RUN addgroup -S spring && adduser -S spring -G spring USER spring:spring EXPOSE 8080 diff --git a/quoteGarden/Dockerfile b/quoteGarden/Dockerfile index b6519eb..d9e89f1 100644 --- a/quoteGarden/Dockerfile +++ b/quoteGarden/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:11-jdk-alpine +FROM openjdk:8-jdk-alpine RUN addgroup -S spring && adduser -S spring -G spring USER spring:spring EXPOSE 8080 diff --git a/useCasePeople/Dockerfile b/useCasePeople/Dockerfile index 3301591..1d8db34 100644 --- a/useCasePeople/Dockerfile +++ b/useCasePeople/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:11-jdk-alpine +FROM openjdk:8-jdk-alpine RUN addgroup -S spring && adduser -S spring -G spring USER spring:spring EXPOSE 8080 From 07de6ce1e0dfffc89b0dcc5bed3f2ee2d2a246f0 Mon Sep 17 00:00:00 2001 From: gaverianov Date: Tue, 12 Jul 2022 11:45:47 +0300 Subject: [PATCH 9/9] commit --- src/main/kotlin/com/stringconcat/people/PeopleApplication.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/kotlin/com/stringconcat/people/PeopleApplication.kt b/src/main/kotlin/com/stringconcat/people/PeopleApplication.kt index 0e0f1eb..d619440 100644 --- a/src/main/kotlin/com/stringconcat/people/PeopleApplication.kt +++ b/src/main/kotlin/com/stringconcat/people/PeopleApplication.kt @@ -2,8 +2,10 @@ package com.stringconcat.people import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.boot.runApplication +import org.springframework.context.annotation.ComponentScan @SpringBootApplication +@ComponentScan(value = ["com.stringconcat.people"]) class PeopleApplication fun main(args: Array) {