Skip to content

Commit

Permalink
remove hyphen from docker compose
Browse files Browse the repository at this point in the history
  • Loading branch information
briskt committed Jul 31, 2024
1 parent e6bce63 commit 0caa626
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 75 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,4 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4
- name: Tests
run: docker-compose run --rm php ./run-tests.sh

run: docker compose run --rm php ./run-tests.sh
20 changes: 10 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@

# Set up the default (i.e. - first) make entry.
test:
docker-compose run --rm php bash -c "./run-tests.sh"
docker compose run --rm php bash -c "./run-tests.sh"

bash:
docker-compose run --rm php bash
docker compose run --rm php bash

behatappend:
docker-compose run --rm php bash -c "vendor/bin/behat --append-snippets"
docker compose run --rm php bash -c "vendor/bin/behat --append-snippets"

behatv:
docker-compose run --rm php bash -c "vendor/bin/behat -v --stop-on-failure"
docker compose run --rm php bash -c "vendor/bin/behat -v --stop-on-failure"

clean:
docker-compose kill
docker-compose rm -f
docker compose kill
docker compose rm -f

composer:
docker-compose run --rm php bash -c "composer install --no-scripts --no-plugins"
docker compose run --rm php bash -c "composer install --no-scripts --no-plugins"

# Example: `make composerrequire NAME=monolog/monolog`
composerrequire:
docker-compose run --rm php bash -c "composer require $(NAME) --no-scripts --no-plugins"
docker compose run --rm php bash -c "composer require $(NAME) --no-scripts --no-plugins"

composerupdate:
docker-compose run --rm php bash -c "composer update --no-scripts"
docker compose run --rm php bash -c "composer update --no-scripts"

ps:
docker-compose ps
docker compose ps
59 changes: 0 additions & 59 deletions Vagrantfile

This file was deleted.

6 changes: 2 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
version: "2"

services:

php:
image: silintl/php8:8.1
volumes:
- ./:/data
extra_hosts:
- "trusted_host.org:10.0.1.1"
- "untrusted_host.org:22.0.1.1"
- "trusted_host.org:10.0.1.1"
- "untrusted_host.org:22.0.1.1"
working_dir: /data

0 comments on commit 0caa626

Please sign in to comment.