Improved docker compose compatibility with github actions

ShipStream · Apr 25, 2024 · bb07d73 · bb07d73
1 parent b42b48f
commit bb07d73
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 14 deletions.
diff --git a/.github/workflows/test_build_push.yml b/.github/workflows/test_build_push.yml
@@ -27,12 +27,6 @@ jobs:
         uses: actions/checkout@v4
       - name: Set up improved Docker Buildx support
         uses: docker/setup-buildx-action@v3
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Run tests for captain
         run: npm run docker:captain-test
       - name: Run tests for mate
@@ -55,6 +49,12 @@ jobs:
           tags: |
             type=semver,pattern={{raw}}
             type=sha
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: "Build and push captain"
         uses: docker/build-push-action@v5
         with:

diff --git a/captain/__tests__/utils/jestSetup.ts b/captain/__tests__/utils/jestSetup.ts
@@ -1,8 +1,14 @@
+import { CustomRaceConditionLock } from "../../src/coreUtils.js"
+
+const unhandledRejectionToIgnore = [CustomRaceConditionLock.lockObsolete];
+
 // preserve original setTimeout in case needed to be used when using fake timers
 (global as any).originalSetTimeout = global.setTimeout
 process.on('unhandledRejection', (error, origin) => {
-  console.error(origin, error)
-  fail(error)
+  if (!unhandledRejectionToIgnore?.includes(`${error}`)) {
+    console.error(origin, error)
+    fail(error)  
+  }
 })
 process.on('uncaughtException', (error, origin) => {
   console.error(origin, error)

diff --git a/docker-compose-base.yml b/docker-compose-base.yml
@@ -82,8 +82,7 @@ services:
   dns-server-template:
     hostname: dns-server
     image: technitium/dns-server:latest
-    ports:
-      - '5380:5380/tcp' #DNS web console (HTTP)
+    expose:
       - '53:53/udp' #DNS service
       - '53:53/tcp' #DNS service
     environment:

diff --git a/docker-compose-captain-test.yml b/docker-compose-captain-test.yml
@@ -46,8 +46,9 @@ services:
     networks:
       custom-network:
         ipv4_address: 10.6.0.11
-    ports: 
-      - 8001:80
+    # # for debugging during testing
+    # ports: 
+    #   - 8001:80
     depends_on:
       - dns-server
     # dns:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -156,6 +156,8 @@ services:
       service: dns-server-template
     volumes:
       - technitium-config:/etc/dns
+    ports:
+      - '5380:5380/tcp' #DNS web console (HTTP)
     networks:
       custom-network:
         ipv4_address: 10.5.0.2

diff --git a/mate/__tests__/utils/jestSetup.ts b/mate/__tests__/utils/jestSetup.ts
@@ -1,8 +1,14 @@
+import { CustomRaceConditionLock } from "../../src/coreUtils.js"
+
+const unhandledRejectionToIgnore = [CustomRaceConditionLock.lockObsolete];
+
 // preserve original setTimeout in case needed to be used when using fake timers
 (global as any).originalSetTimeout = global.setTimeout
 process.on('unhandledRejection', (error, origin) => {
-  console.error(origin, error)
-  fail(error)
+  if (!unhandledRejectionToIgnore?.includes(`${error}`)) {
+    console.error(origin, error)
+    fail(error)  
+  }
 })
 process.on('uncaughtException', (error, origin) => {
   console.error(origin, error)