wip

nmshd · Apr 12, 2024 · 5dce525 · 5dce525
1 parent d72a5f0
commit 5dce525
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 27 deletions.
diff --git a/.ci/docker-compose.test.yml b/.ci/docker-compose.test.yml
@@ -36,17 +36,17 @@ services:
     container_name: admin-ui-test
     hostname: admin-ui
     image: admin-ui
-    build:
-      context: ..
-      dockerfile: AdminApi/src/AdminApi/Dockerfile
-      cache_from:
-        #- type=local,src=/tmp/.buildx-cache
-        - type=registry,ref=localhost:6000/test-adminui
-      cache_to:
-        #- type=local,dest=/tmp/.buildx-cache-new,mode=min
-        - type=inline
-      args:
-        DOCKER_BUILDKIT: 1
+#    build:
+#      context: ..
+#      dockerfile: AdminApi/src/AdminApi/Dockerfile
+#      cache_from:
+#        #- type=local,src=/tmp/.buildx-cache
+#        - type=registry,ref=localhost:6000/test-adminui
+#      cache_to:
+#        #- type=local,dest=/tmp/.buildx-cache-new,mode=min
+#        - type=inline
+#      args:
+#        DOCKER_BUILDKIT: 1
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
     ports:
@@ -84,17 +84,17 @@ services:
   seed-client:
     container_name: seed-client-test
     image: seed-client
-    build:
-      context: ..
-      dockerfile: Modules/Devices/src/Devices.AdminCli/Dockerfile
-      cache_from:
-        #- type=local,src=/tmp/.buildx-cache
-        - type=registry,ref=localhost:6000/seed-client
-      cache_to:
-        #- type=local,dest=/tmp/.buildx-cache-new,mode=min
-        - type=inline
-      args:
-        DOCKER_BUILDKIT: 1
+#    build:
+#      context: ..
+#      dockerfile: Modules/Devices/src/Devices.AdminCli/Dockerfile
+#      cache_from:
+#        #- type=local,src=/tmp/.buildx-cache
+#        - type=registry,ref=localhost:6000/seed-client
+#      cache_to:
+#        #- type=local,dest=/tmp/.buildx-cache-new,mode=min
+#        - type=inline
+#      args:
+#        DOCKER_BUILDKIT: 1
     depends_on:
       consumer-api:
         condition: service_healthy

diff --git a/.ci/integrationTest.postgres.sh b/.ci/integrationTest.postgres.sh
@@ -16,7 +16,7 @@ debugRun() {
 
 {
   debugRun dockerCompose down;
-  debugRun dockerCompose build;
+#  debugRun dockerCompose build;
   debugRun dockerCompose up -d
 } &
 {

diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml
@@ -81,20 +81,39 @@ jobs:
       #- name: Run Tests
       #  run: python .ci/integrationTest.py build
 
-#      - name: Run local registry
-#        run: docker run -d -p 6000:5000 --restart=always --name registry -v /tmp/docker-registry:/var/lib/registry registry:2 && npx wait-on tcp:6000
+      - name: Run local registry
+        run: docker run -d -p 6000:5000 --restart=always --name registry -v /tmp/docker-registry:/var/lib/registry registry:2 && npx wait-on tcp:6000
 
       - name: Build Consumer Api
         uses: docker/build-push-action@v5
         with: 
           context: .
           file: ConsumerApi/Dockerfile
-          push: false
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          tags: consumer-api
+          tags: localhost:6000/consumer-api
+          output: type=registry,dest=localhost:6000/consumer-api
 
+      - name: Build Admin Api
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: AdminApi/src/AdminApi/Dockerfile
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          tags: localhost:6000/admin-ui
+          output: type=registry,dest=localhost:6000/admin-ui  
 
+      - name: Build Seed Client
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: Modules/Devices/src/Devices.AdminCli/Dockerfile
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          tags: localhost:6000/seed-client
+          output: type=registry,dest=localhost:6000/seed-client
+
       - name: Run integration tests
         run: ./.ci/integrationTest.postgres.sh