octopus-vcs-facade-12 Support all features for Gitlab CE

octopusden · Aug 25, 2023 · 1021db6 · 1021db6
1 parent a114d15
commit 1021db6
Show file tree

Hide file tree

Showing 32 changed files with 6,891 additions and 711 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,4 +1,3 @@
-import org.octopusden.octopus.task.MigrateMockData
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -59,8 +58,4 @@ subprojects {
             jvmTarget = "1.8"
         }
     }
-
-    val migrateMockData by tasks.creating(MigrateMockData::class) {
-        this.testDataDir = rootDir.toString() + File.separator + "test-data"
-    }
 }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
diff --git a/buildSrc/src/main/kotlin/org/octopusden/octopus/task/MigrateMockData.kt b/buildSrc/src/main/kotlin/org/octopusden/octopus/task/MigrateMockData.kt
diff --git a/ft/build.gradle.kts b/ft/build.gradle.kts
@@ -65,12 +65,8 @@ tasks.named("composeUp") {
     dependsOn(":vcs-facade:dockerBuildImage")
 }
 
-tasks.named("migrateMockData") {
-    dependsOn("composeUp")
-}
-
 tasks.named("ft") {
-    dependsOn("migrateMockData")
+    dependsOn("composeUp")
 }
 
 idea.module {

diff --git a/ft/docker/application-ft.yml b/ft/docker/application-ft.yml
@@ -3,8 +3,10 @@ eureka:
     enabled: false
 
 gitlab:
-  host: http://mockserver:1080/gitlab
-  token: gitlab-secured-token
+  host: http://gitlab:8990
+  token:
+  username: root
+  password: VomkaEa6PD1OIgY7dQVbPUuO8wi9RMCaZw/i9yPXcI0=
   health-check:
     repo: git@mockserver:1080/gitlab:test-data/vcs-facade-healthcheck.git
     rootCommit: 9320183f5d5f5868fdb82b36e3abd6f9d1424114

diff --git a/ft/docker/docker-compose.yml b/ft/docker/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   vcs-facade:
-    container_name: ft-vcs-facade
+    container_name: vcs-facade-ft-vcs-facade
     image: ${OCTOPUS_GITHUB_DOCKER_REGISTRY}/octopusden/vcs-facade:${APP_VERSION:-1.0-SNAPSHOT}
     ports:
       - "8080:8080"
@@ -14,8 +14,10 @@ services:
       - SPRING_PROFILES_ACTIVE=ft
 
   bitbucket:
-    container_name: ft-bitbucket
+    container_name: vcs-facade-ft-bitbucket
     image: ${DOCKER_REGISTRY}/atlassian/bitbucket-server:8.6.1-jdk11
+    depends_on:
+      - bitbucket-db
     ports:
       - "7999:7999"
       - "7990:7990"
@@ -33,15 +35,29 @@ services:
       JDBC_URL: jdbc:postgresql://bitbucket-db:5432/bitbucket
 
   bitbucket-db:
-    container_name: ft-bitbucket-db
-    image: ${DOCKER_REGISTRY}/postgres:12-alpine
+    container_name: vcs-facade-ft-bitbucket-db
+    image: ${DOCKER_REGISTRY}/postgres:13-alpine
     environment:
       POSTGRES_USER: bitbucket
       POSTGRES_PASSWORD: bitbucket
       POSTGRES_DB: bitbucket
 
-  mockserver:
-    container_name: ft-mockserver
-    image: ${DOCKER_REGISTRY}/mockserver/mockserver:mockserver-5.11.1
+  gitlab:
+    container_name: vcs-facade-ft-gitlab
+    image: ${DOCKER_REGISTRY}/gitlab/gitlab-ce:16.2.4-ce.0
+    depends_on:
+      - gitlab-db
     ports:
-      - "1080:1080"
+      - "8990:8990"
+    volumes:
+      - ./gitlab.rb:/etc/gitlab/gitlab.rb
+
+  gitlab-db:
+    container_name: vcs-facade-ft-gitlab-db
+    image: ${DOCKER_REGISTRY}/postgres:13-alpine
+    environment:
+      POSTGRES_USER: gitlab
+      POSTGRES_PASSWORD: gitlab
+      POSTGRES_DB: gitlab
+    ports:
+      - "6432:5432"