Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Docker API #8

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@ vendor/
bin/
composer.lock
.vagrant
phpunit.xml
.phpunit.result.cache
.phpunit.coverage
.phpunit.coverage.*
3 changes: 2 additions & 1 deletion .jane-openapi
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
return [
'directory' => 'generated/',
'namespace' => 'Docker\\API',
'openapi-file' => __DIR__ . '/docker-swagger.json',
'strict' => false,
'openapi-file' => __DIR__ . '/v1.47.yaml',
];
9 changes: 1 addition & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Docker PHP
**Docker PHP** (for lack of a better name) is a [Docker](http://docker.com/) client written in PHP.
This library aim to reach 100% API support of the Docker Engine.

The test suite currently passes against the [Docker Remote API v1.24](http://docs.docker.com/reference/api/docker_remote_api_v1.24/).
The test suite currently passes against the [Docker Remote API v1.47](https://docs.docker.com/reference/api/engine/version/v1.47/).

[![Documentation Status](https://readthedocs.org/projects/docker-php/badge/?version=latest)](http://docker-php.readthedocs.org/en/latest/)
[![Latest Version](https://img.shields.io/github/release/plesk/docker-php.svg?style=flat-square)](https://github.com/plesk/docker-php/releases)
Expand Down Expand Up @@ -77,13 +77,6 @@ Credits

This README heavily inspired by [willdurand/Negotiation](https://github.com/willdurand/Negotiation) by @willdurand. This guy is pretty awesome.

Change of jane/open-api dependency
----------------------------------

Previous version of **Docker PHP** library had **"jane/open-api": "^1.3"** composer dependency. This project is deprecated and archived.
Authors suggest to use https://github.com/janephp/janephp but we used a few classes only so we rewrote them in this library (src/custom).
If some issues happen we should consider to use recommended library and rewrite this library in appropriate way which could be tricky task since code is completely different

License
-------

Expand Down
17 changes: 11 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,27 @@
"require": {
"php": ">=8.2",
"symfony/filesystem": "^6.3",
"symfony/process": "^6.3",
"php-http/client-common": "^2.5",
"php-http/message": "^1.16",
"symfony/process": "^6.3|^7.0",
"php-http/client-common": "^2.7",
"guzzlehttp/psr7": "^2.6",
"symfony/serializer": "^6.3",
"symfony/options-resolver": "^6.3",
"php-http/message-factory": "^1.1"
"jane-php/open-api-runtime": "^7.8"
},
"require-dev": {
"phpunit/phpunit": "^10.4",
"friendsofphp/php-cs-fixer": "^3.35"
"friendsofphp/php-cs-fixer": "^3.35",
"jane-php/open-api-2": "^7.8"
},
"scripts": {
"test": "vendor/bin/phpunit",
"test-ci": "vendor/bin/phpunit --coverage-clover build/coverage.xml"
},
"prefer-stable": true,
"minimum-stability": "dev"
"minimum-stability": "dev",
"config": {
"allow-plugins": {
"php-http/discovery": false
}
}
}
53 changes: 27 additions & 26 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
php54:
image: jolicode/php54
command: sh -c 'cd /app && composer update && vendor/bin/phpunit'
user: root
volumes:
- ./:/app
- /var/run/docker.sock:/var/run/docker.sock
php55:
image: jolicode/php55
command: sh -c 'cd /app && composer update && vendor/bin/phpunit'
user: root
volumes:
- ./:/app
- /var/run/docker.sock:/var/run/docker.sock
php56:
image: phundament/php-one:5.6-fpm
command: sh -c 'composer update && vendor/bin/phpunit'
volumes:
- ./:/app
- /var/run/docker.sock:/var/run/docker.sock
php70:
image: phundament/php-one:7.0-fpm
command: sh -c 'composer update && vendor/bin/phpunit'
volumes:
- ./:/app
- /var/run/docker.sock:/var/run/docker.sock
services:
php54:
image: jolicode/php54
command: sh -c 'cd /app && composer update && vendor/bin/phpunit'
user: root
volumes:
- ./:/app
- /var/run/docker.sock:/var/run/docker.sock
php55:
image: jolicode/php55
command: sh -c 'cd /app && composer update && vendor/bin/phpunit'
user: root
volumes:
- ./:/app
- /var/run/docker.sock:/var/run/docker.sock
php56:
image: phundament/php-one:5.6-fpm
command: sh -c 'composer update && vendor/bin/phpunit'
volumes:
- ./:/app
- /var/run/docker.sock:/var/run/docker.sock
php70:
image: phundament/php-one:7.0-fpm
command: sh -c 'composer update && vendor/bin/phpunit'
volumes:
- ./:/app
- /var/run/docker.sock:/var/run/docker.sock
Loading