Skip to content

Commit

Permalink
Merge pull request #184 from line-o/fix/accept-invalid-SSL-cert-warning
Browse files Browse the repository at this point in the history
fix: accept invalid SSL cert warning
  • Loading branch information
duncdrum authored Nov 20, 2023
2 parents dbc5d96 + b88af73 commit 7195c83
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 24 deletions.
31 changes: 14 additions & 17 deletions .github/workflows/test-no-rest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,35 +7,32 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
# pull image
- run: docker pull existdb/existdb:release
# create docker container
# --volume $(pwd)/empty:/exist/autodeploy:ro
- name: pull image
run: docker pull existdb/existdb:release
- name: create eXist-db Container
run: docker create --name exist --publish 8080:8080 --publish 8443:8443 existdb/existdb:release
# - name: Start eXist-db Container
# run: docker start exist
# - name: Wait for eXist-db Startup
# run: timeout 90 sh -c 'until nc -z $0 $1; do sleep 3; done' localhost 8080
# get web.xml (use prepared web.xml instead)
# - run: docker cp exist:exist/etc/webapp/WEB-INF/web.xml ./web.xml
# modify web.xml
# - run: cat web.xml | \
run: |
docker create --rm --name exist \
--publish 8080:8080 --publish 8443:8443 \
--volume ./empty:/exist/autodeploy:ro \
existdb/existdb:release
# - name: get web.xml from container (needs to have started before)
# run: docker cp exist:exist/etc/webapp/WEB-INF/web.xml ./web.xml
# - name: modify web.xml
# run: cat web.xml | \
# tr '\n' '\r' | \
# sed -E 's/(<param-name>hidden<\/param-name>\r[[:space:]]+<param-value>)false(<\/param-value>)/\1true\2/' | \
# tr '\r' '\n' > modified-web.xml
- name: Copy modified web.xml
run: docker cp ./spec/fixtures/web-no-rest.xml exist:exist/etc/webapp/WEB-INF/web.xml
- name: Restart eXist-db Container
# run: docker stop exist && docker wait; docker start exist
- name: Start eXist-db Container
run: docker start exist
- name: Wait for eXist-db Startup
run: timeout 90 sh -c 'until nc -z $0 $1; do sleep 3; done' localhost 8080
- name: Use Node.js 20
uses: actions/setup-node@v3
with:
node-version: 20
- run: npm ci --no-optional
- run: npm link
- name: Wait for container to be healthy
run: timeout 60s sh -c 'until docker ps | grep exist | grep -q healthy; do echo "Not ready yet."; sleep 2; done; echo "$(docker ps | grep exist)"'
- run: npm run test:norest

12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"maintainers": [],
"license": "MIT",
"dependencies": {
"@existdb/node-exist": "^5.5.0",
"@existdb/node-exist": "^5.5.1",
"bottleneck": "^2.19.5",
"chalk": "^5.2.0",
"dotenv": "^16.0.3",
Expand Down

0 comments on commit 7195c83

Please sign in to comment.