starred/docker
1
0
Fork 0
mirror of https://github.com/phpmyadmin/docker.git synced 2026-08-24 02:24:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use docker compose plugin instead of the old binary

Browse Source
This commit is contained in:
William Desportes
2024-04-02 19:56:17 +02:00
parent 215f36692f
commit 79a51154c1
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/run-tests.yml
+2 -2
View File
@@ -29,9 +29,9 @@ jobs:
run: sed -i 's/mariadb-admin/mysqladmin/' ./docker-compose.testing-${{ matrix.configuration }}.yml
- name: Build images
working-directory: ./testing/
run: docker-compose -f ./docker-compose/docker-compose.testing-${{ matrix.configuration }}.yml build
run: docker compose -f ./docker-compose/docker-compose.testing-${{ matrix.configuration }}.yml build
- name: Run ${{ matrix.configuration }} tests
working-directory: ./testing/
run: docker-compose -f ./docker-compose/docker-compose.testing-${{ matrix.configuration }}.yml up --build --abort-on-container-exit --exit-code-from=sut
run: docker compose -f ./docker-compose/docker-compose.testing-${{ matrix.configuration }}.yml up --build --abort-on-container-exit --exit-code-from=sut
env:
DB: ${{ matrix.database-image }}
Makefile
+6 -6
View File
@@ -16,24 +16,24 @@ build-fpm-alpine:
docker build ${DOCKER_FLAGS} -t ${DOCKER_REPO}:testing-fpm-alpine fpm-alpine
run:
docker-compose -f ./testing/docker-compose/docker-compose.testing-default.yml up -d
docker compose -f ./testing/docker-compose/docker-compose.testing-default.yml up -d
testing-%:
docker-compose -p "phpmyadmin_$@" -f ./testing/docker-compose/docker-compose.$@.yml up --build --abort-on-container-exit --exit-code-from=sut
docker-compose -p "phpmyadmin_$@" -f ./testing/docker-compose/docker-compose.$@.yml down
docker compose -p "phpmyadmin_$@" -f ./testing/docker-compose/docker-compose.$@.yml up --build --abort-on-container-exit --exit-code-from=sut
docker compose -p "phpmyadmin_$@" -f ./testing/docker-compose/docker-compose.$@.yml down
run-tests: testing-default testing-one-host testing-one-socket-host testing-config-mount-dir testing-fs-import-export testing-different-apache-port
logs:
docker-compose -f ./testing/docker-compose/docker-compose.testing-default.yml logs
docker compose -f ./testing/docker-compose/docker-compose.testing-default.yml logs
clean: stop rm prune
stop:
docker-compose -f ./testing/docker-compose/docker-compose.testing-default.yml stop
docker compose -f ./testing/docker-compose/docker-compose.testing-default.yml stop
rm:
docker-compose -f ./testing/docker-compose/docker-compose.testing-default.yml rm
docker compose -f ./testing/docker-compose/docker-compose.testing-default.yml rm
prune:
docker rm `docker ps -q -a --filter status=exited`
README.md
+2 -2
View File
@@ -81,7 +81,7 @@ You can use arbitrary servers by adding the environment variable `PMA_ARBITRARY=
docker run --name phpmyadmin -d -e PMA_ARBITRARY=1 -p 8080:80 phpmyadmin:latest
```
## Usage with docker-compose and arbitrary server
## Usage with docker compose and an arbitrary server
This will run phpMyAdmin with the arbitrary server option - allowing you to specify any MySQL/MariaDB
server on the login page.
@@ -210,7 +210,7 @@ docker run --name phpmyadmin -d -e PMA_PASSWORD_FILE=/run/secrets/db_password.tx
## Run the E2E tests for this docker image
You can run the E2E test suite on a local test environment.
The Requirements are `make`, `docker` and `docker-compose`.
The Requirements are `make`, `docker` and the `docker compose` plugin.
Clone this repository: `https://github.com/phpmyadmin/docker.git`