Migrate kotlin-dsl -> embedded-kotlin

Author: daggerok

.travis.yml

@@ -157,8 +157,8 @@ jobs:
       jdk: openjdk11
       name: Postgres (openjdk11)
       script:
-        - ./gradlew clean assemble >/dev/null
-        - ./gradlew clean assemble postgresUp >/dev/null
+        - ./gradlew clean assemble
+        - ./gradlew clean assemble postgresUp
         - bash ./modules/apps/file-items-service/build/libs/*.jar --spring.profiles.active=db-pg &
         - wait_for 8001
         - cp -Rf ./modules/apps/file-server/build/libs "${APP_UPLOAD_PATH}/"
@@ -175,8 +175,8 @@ jobs:
       jdk: openjdk8
       name: Postgres (openjdk8)
       script:
-        - ./gradlew clean assemble >/dev/null
-        - ./gradlew clean assemble postgresUp >/dev/null
+        - ./gradlew clean assemble
+        - ./gradlew clean assemble postgresUp
         - bash ./modules/apps/file-items-service/build/libs/*.jar --spring.profiles.active=db-pg &
         - wait_for 8001
         - cp -Rf ./modules/apps/file-server/build/libs "${APP_UPLOAD_PATH}/"

DEVELOPMENT.md

@@ -59,7 +59,6 @@ open `pwd`/modules/apps/file-server/build/jgiven-report/index.html
 ```sh
 ./gradlew clean assemble allUp -Pdebug
 http -a user:password :80
-./gradlew allDown
 ```
 
 **run all in docker manually**

RELEASE.md

@@ -1,8 +1,11 @@
 # streaming-file-server
-_version: 4.3.31_
+_4.3.31 release notes_
 
-* Gradle 6.0.1
+* Migrate tp Gradle 6.0.1
+* Migrate `kotlin-dsl` -> `embedded-kotlin`
 * Remove useless gradle propdeps plugins
+* More Gradle Kotlin DSL migrations
+* Update docker images
 
 ## Java file server 
 

buildSrc/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
   idea
   eclipse
-  `kotlin-dsl`
+  `embedded-kotlin`
 }
 
 repositories {
@@ -21,7 +21,3 @@ eclipse {
     isDownloadSources = true
   }
 }
-
-kotlinDslPluginOptions {
-  experimentalWarning.set(false)
-}

modules/docker/all/base-streaming-file-server/Dockerfile

@@ -1,4 +1,6 @@
-FROM openjdk:14-jdk-alpine3.10
+#FROM openjdk:14...-jdk-alpine3.10 # <- this one is doesn't work!
+FROM openjdk:13-jdk-alpine3.10
+#FROM openjdk:13-ea-jdk-alpine3.10
 #FROM openjdk:13-ea-19-jdk-alpine3.9
 #FROM openjdk:8u201-jre-alpine3.9
 ##FROM openjdk:8u191-jre-alpine3.8
@@ -20,7 +22,6 @@ VOLUME /home/appuser
 ARG JAVA_OPTS_ARGS='\
 -Djava.net.preferIPv4Stack=true \
 -XX:+UnlockExperimentalVMOptions \
--XX:+UnlockExperimentalVMOptions \
 -XshowSettings:vm '
 ENV JAVA_OPTS="${JAVA_OPTS} ${JAVA_OPTS_ARGS}"
 

modules/docker/all/file-items-service/Dockerfile

@@ -27,8 +27,8 @@ FROM docker_base-streaming-file-server:latest
 ENTRYPOINT java ${JAVA_OPTS} -jar ./app.jar --spring.profiles.active=db-pg
 EXPOSE 8001
 HEALTHCHECK --retries=33 \
-            --timeout=1s \
+            --timeout=3s \
             --interval=3s \
-            --start-period=1s \
+            --start-period=3s \
             CMD wget --quiet --tries=1 --spider http://127.0.0.1:8001/actuator/health || exit 1
 COPY --chown=appuser ./modules/apps/file-items-service/build/libs/*.jar ./app.jar

modules/docker/all/file-server/Dockerfile

@@ -32,9 +32,9 @@ FROM docker_base-streaming-file-server:latest
 ENTRYPOINT java ${JAVA_OPTS} -jar ./app.jar --spring.profiles.active=db-pg
 EXPOSE 8002
 HEALTHCHECK --retries=33 \
-            --timeout=1s \
+            --timeout=3s \
             --interval=3s \
-            --start-period=1s \
+            --start-period=3s \
             CMD wget --quiet --tries=1 --spider http://127.0.0.1:8002/actuator/health || exit 1
 ARG APP_UPLOAD_PATH_ARG='/var/file-storage'
 ENV APP_UPLOAD_PATH="${APP_UPLOAD_PATH_ARG}"

modules/docker/all/haproxy/Dockerfile

@@ -1,10 +1,11 @@
-FROM haproxy:2.0.0-alpine
+FROM haproxy:2.0.9-alpine
+#FROM haproxy:2.0.0-alpine
 #FROM haproxy:1.9.8-alpine
 ##FROM haproxy:1.9.7-alpine
 HEALTHCHECK --retries=33 \
-            --timeout=1s \
+            --timeout=3s \
             --interval=3s \
-            --start-period=1s \
+            --start-period=3s \
             CMD true
 RUN apk add --update --no-cache curl
 COPY ./haproxy.cfg /usr/local/etc/haproxy/haproxy.cfg

modules/docker/all/nginx/Dockerfile

@@ -1,9 +1,10 @@
-FROM nginx:1.17.0-alpine
+FROM nginx:1.17.6-alpine
+#FROM nginx:1.17.0-alpine
 #FROM nginx:1.15.12-alpine
 LABEL MAINTAINER='Maksim Kostromin https://github.com/daggerok'
 HEALTHCHECK --retries=33 \
-            --timeout=1s \
+            --timeout=3s \
             --interval=3s \
-            --start-period=1s \
+            --start-period=3s \
             CMD true
 ADD ./default.conf /etc/nginx/conf.d/default.conf

modules/docker/build.gradle.kts

@@ -1,11 +1,9 @@
 subprojects {
     apply<com.avast.gradle.dockercompose.DockerComposePlugin>()
 
-    // fucking windows paths... replace all: '\\' -> '/'
     val root = rootDir.absolutePath.replace("\\\\", "/")
-
-    // gradle -Pdebug
-    val isDebugEnabled = this.hasProperty("debug")
+    val debugEnabledProperty = project.findProperty("debug") ?: "false"
+    val isDebugEnabled = debugEnabledProperty != "false"
 
     configure<com.avast.gradle.dockercompose.ComposeExtension> {
         useComposeFiles = listOf("${root}/modules/docker/${name}/docker-compose.yml")
@@ -18,10 +16,15 @@ subprojects {
         removeVolumes = true
         removeOrphans = true
         forceRecreate = true
-        //executable = '/path/to/docker-compose'
-        //dockerExecutable = '/path/to/docker'
-        //captureContainersOutput = true
-        //captureContainersOutput = false
-        //captureContainersOutputToFile = '/path/to/logFile'
+    }
+
+    tasks {
+        create("${name}Up") {
+            if (name.contains("app")) dependsOn(assemble.get())
+            dependsOn(named("composeUp").get().path)
+        }
+        create("${name}Down") {
+            finalizedBy(named("composeDown").get().path)
+        }
     }
 }