revert compose management due to issues with dockerignore file

VEuPathDB · May 16, 2024 · 2697ae1 · 2697ae1
1 parent ca58826
commit 2697ae1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 140 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -5,7 +5,6 @@ ARG GITHUB_TOKEN
 
 WORKDIR /workspace
 
-COPY buildSrc buildSrc
 COPY settings.gradle.kts settings.gradle.kts
 COPY build.gradle.kts build.gradle.kts
 COPY platform platform

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,15 +1,12 @@
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import vdi.Compose
 
 plugins {
   kotlin("jvm") version "1.9.23"
   id("com.github.johnrengelman.shadow") version "7.1.2"
 }
 
-apply<Compose>()
-
 allprojects {
 
   configurations.all {

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
diff --git a/buildSrc/src/main/kotlin/vdi/Compose.kt b/buildSrc/src/main/kotlin/vdi/Compose.kt
diff --git a/makefile b/makefile
@@ -12,7 +12,12 @@ default:
 
 .PHONY: build
 build:
-	@./gradlew -q compose -Pcompose-target=build
+	@docker compose \
+      -f docker-compose.yml \
+      -f docker-compose.dev.yml \
+      build \
+      --build-arg=GITHUB_USERNAME=${GITHUB_USERNAME} \
+      --build-arg=GITHUB_TOKEN=${GITHUB_TOKEN}
 
 .PHONY: raml-gen
 raml-gen:
@@ -27,19 +32,19 @@ raml-gen:
 
 .PHONY: up
 up: env-file-test
-	@./gradlew -q compose -Pcompose-target=up
+	@docker compose -f docker-compose.yml -f docker-compose.dev.yml -f docker-compose.ssh.yml up -d
 
 .PHONY: down
 down: env-file-test
-	@./gradlew -q compose -Pcompose-target=down
+	@docker compose -f docker-compose.yml -f docker-compose.dev.yml -f docker-compose.ssh.yml down -v
 
 .PHONY: start
 start: env-file-test
-	@./gradlew -q compose -Pcompose-target=start
+	@docker compose -f docker-compose.yml -f docker-compose.dev.yml -f docker-compose.ssh.yml start
 
 .PHONY: stop
 stop: env-file-test
-	@./gradlew -q compose -Pcompose-target=stop
+	@docker compose -f docker-compose.yml -f docker-compose.dev.yml -f docker-compose.ssh.yml stop
 
 
 ####