Skip to content

Commit

Permalink
Implement a saver way of running container commands (#8)
Browse files Browse the repository at this point in the history
- Update compose file to allow webserver is running on a selected port for
  local testing, also in non-priveleged environments
- Try catching exception in running container cmds
- Update matrix versions
- Split api and database test into separate steps
- Remove deprecated eslint comments
- Update build version
  • Loading branch information
cmeissner authored Oct 30, 2023
1 parent b86be8b commit 1f07231
Show file tree
Hide file tree
Showing 7 changed files with 1,729 additions and 515 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,16 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
phpipam: ['1.4x','1.5x']
phpipam: ['v1.4x','v1.5x']
steps:
- uses: actions/checkout@v2
- name: run phpipam-action
- name: Run phpipam-action
uses: ./ # use action in the root directory
with:
ipam_version: ${{ matrix.phpipam }}
- name: "Test phpipam api and database"
- name: "Test phpipam api"
run: |
curl -k --user Admin:ipamadmin -X POST https://localhost/api/ansible/user/
- name: "Test database"
run: |
mysql -h 127.0.01 -u ${{ env.IPAM_DATABASE_USER }} -p${{ env.IPAM_DATABASE_PASS }} ${{ env.IPAM_DATABASE_NAME }} --execute="SHOW TABLES"
2 changes: 1 addition & 1 deletion dist/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ services:
phpipam:
image: phpipam/phpipam-www:${IPAM_VERSION:-1.4x}
ports:
- "443:443"
- "${PHPIPAM_PORT:-443}:443"
environment:
IPAM_DATABASE_HOST: "${IPAM_DATABASE_HOST:-database}"
IPAM_DATABASE_USER: "${IPAM_DATABASE_USER:-phpipam}"
Expand Down
Loading

0 comments on commit 1f07231

Please sign in to comment.