Skip to content
This repository has been archived by the owner on May 14, 2024. It is now read-only.

Commit

Permalink
Merge pull request #794 from ldapjs/docker-updates
Browse files Browse the repository at this point in the history
Update docker config
  • Loading branch information
jsumners committed Mar 27, 2022
2 parents fd39f3b + 7a758f2 commit 9143456
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 23 deletions.
24 changes: 8 additions & 16 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 .",
Expand Down

0 comments on commit 9143456

Please sign in to comment.