feedback

broadinstitute · May 23, 2024 · 5e8684f · 5e8684f
1 parent c22cc25
commit 5e8684f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -43,10 +43,8 @@ jobs:
       run: npm ci
     - name: Build applications
       run: |
-        REACT_APP_UNAUTHED_LOGIN=true ./gradlew :api-participant:jibDockerBuild -Djib.to.image=api-participant:ci
-        REACT_APP_UNAUTHED_LOGIN=true ./gradlew :api-admin:jibDockerBuild -Djib.to.image=api-admin:ci
-        docker run -d -p 8081:8080 --net=host api-participant:ci
-        docker run -d -p 8080:8080 --net=host api-admin:ci
+        ./scripts/run_dockerized.sh participant
+        ./scripts/run_dockerized.sh admin
     - name: Install Playwright Browsers
       run: npx playwright install --with-deps
     - name: Run Playwright tests

diff --git a/build.gradle b/build.gradle
@@ -18,12 +18,6 @@ task bundleParticipantUI(type: NpmTask, dependsOn: [npmInstall, buildUICore]) {
     args = ['--workspace=ui-participant', 'run', 'build']
 }
 
-task printVersion {
-    doLast {
-        println gradle.ext.releaseVersion
-    }
-}
-
 sonar {
     properties {
         property 'sonar.projectName', "${rootProject.name}"

diff --git a/scripts/run_dockerized.sh b/scripts/run_dockerized.sh
@@ -16,8 +16,6 @@ if [ "$1" != "participant" ]; then
     targetport="8081"
 fi
 
-REACT_APP_UNAUTHED_LOGIN=true ./gradlew :api-$1:jibDockerBuild
+REACT_APP_UNAUTHED_LOGIN=true ./gradlew :api-$1:jibDockerBuild -Djib.to.image=api-$1:ci
 
-tagname=$(./gradlew printVersion | grep "\d\.\d.\d")
-
-docker run -p $targetport:8080 --net=host api-$1:$tagname
+docker run -p $targetport:8080 --net=host api-$1:ci