Merge pull request #794 from ldapjs/docker-updates

Update docker config

Author: jsumners

.github/workflows/integration.yml

@@ -13,26 +13,18 @@ jobs:
     name: Baseline Tests
     runs-on: ubuntu-latest
 
-    # services:
-    #   openldap:
-    #     image: docker.pkg.github.com/ldapjs/docker-test-openldap/openldap:1.0
-    #     ports:
-    #       - 389:389
-    #       - 636:636
+    services:
+      openldap:
+        image: ghcr.io/ldapjs/docker-test-openldap/openldap:latest
+        ports:
+          - 389:389
+          - 636:636
 
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
-
-      # Hack way to start service since GitHub doesn't integrate with its own services
-      - name: Docker login
-        run: docker login docker.pkg.github.com -u ${GITHUB_ACTOR} -p ${GITHUB_TOKEN}
-        env:
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-      - name: Pull Docker image
-        run: docker pull "docker.pkg.github.com/ldapjs/docker-test-openldap/openldap:latest"
-      - name: Start OpenLDAP service
-        run: docker run -it -d --name openldap -p 389:389 -p 636:636 docker.pkg.github.com/ldapjs/docker-test-openldap/openldap:latest
+        with:
+          node-version: 'lts/*'
 
       - name: Install Packages
         run: npm install

docker-compose.yml

@@ -2,7 +2,7 @@ version: '3'
 
 services:
   openldap:
-    image: docker.pkg.github.com/ldapjs/docker-test-openldap/openldap:latest
+    image: ghcr.io/ldapjs/docker-test-openldap/openldap:latest
     ports:
       - 389:389
       - 636:636

package.json

@@ -40,12 +40,12 @@
     "tap": "15.2.3"
   },
   "scripts": {
-    "test": "tap --no-cov",
-    "test:ci": "tap --coverage-report=lcovonly",
-    "test:cov": "tap",
-    "test:cov:html": "tap --coverage-report=html",
-    "test:watch": "tap -n -w --no-coverage-report",
-    "test:integration": "tap --no-cov 'test-integration/**/*.test.js'",
+    "test": "tap --no-cov -R terse",
+    "test:ci": "tap --coverage-report=lcovonly -R terse",
+    "test:cov": "tap -R terse",
+    "test:cov:html": "tap --coverage-report=html -R terse",
+    "test:watch": "tap -n -w --no-coverage-report -R terse",
+    "test:integration": "tap --no-cov -R terse 'test-integration/**/*.test.js'",
     "test:integration:local": "docker-compose up -d && npm run test:integration && docker-compose down",
     "lint": "eslint . --fix",
     "lint:ci": "eslint .",