One more time

datalab-org · Aug 17, 2024 · 3c15d36 · 3c15d36
1 parent 09d804b
commit 3c15d36
Showing 1 changed file with 12 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -134,12 +134,10 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Debug info
-        run: |
-          docker image ls
-
       - name: Set some environment variables for CI containers pre-build
         run:
+          cp webapp/.env.test_e2e webapp/.env
+          echo "VUE_APP_API_URL=http://localhost:5001" >> .env
           echo "PYDATALAB_TESTING=true" >> pydatalab/.env
 
       - name: Build Docker images and cache them
@@ -150,8 +148,8 @@ jobs:
           targets: ${{ matrix.target }}
           set: |
             *.cache-to=type=gha,scope=build-${{ matrix.target }},mode=max
-          #  *.cache-from=type=gha,scope=build-${{ matrix.target }}
-
+            *.cache-from=type=gha,scope=build-${{ matrix.target }}
+            api.args.PYDATALAB_TESTING=true
 
   e2e:
     name: e2e tests
@@ -171,6 +169,7 @@ jobs:
 
       - name: Set some environment variables for CI containers pre-build
         run:
+          cp webapp/.env.test_e2e webapp/.env
           echo "VUE_APP_API_URL=http://localhost:5001" >> .env
           echo "PYDATALAB_TESTING=true" >> pydatalab/.env
 
@@ -180,28 +179,19 @@ jobs:
           files: docker-compose.yml
           load: true
           targets: 'app,api,database'
-          #set: |
-          #  app.cache-from=type=gha,scope=build-app
-          #  app.tags=datalab-app:latest
-          #  api.cache-from=type=gha,scope=build-api
-          #  api.tags=datalab-api:latest
-          #  database.cache-from=type=gha,scope=build-database
-          #  database.tags=datalab-database:latest
+          set: |
+            app.cache-from=type=gha,scope=build-app
+            app.tags=datalab-app:latest
+            api.cache-from=type=gha,scope=build-api
+            api.tags=datalab-api:latest
+            database.cache-from=type=gha,scope=build-database
+            database.tags=datalab-database:latest
 
       - name: Start services
         run: |
           # Launch production container profiles and wait for them to come up
-          cp webapp/.env.test_e2e webapp/.env
-          echo "VUE_APP_API_URL=http://localhost:5001" >> .env
-          echo "PYDATALAB_TESTING=true" >> pydatalab/.env
           docker compose up database api app -d --wait
 
-      - name: Show some launch logs
-        run: |
-          docker compose ps -a
-          docker compose logs app --tail 1000
-          docker compose logs api --tail 1000
-
       - name: Run end-to-end tests
         uses: cypress-io/github-action@v6
         with: