Skip to content
This repository has been archived by the owner on Aug 5, 2024. It is now read-only.

Commit

Permalink
Migrate to docker compose plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
itsthejb committed Jul 1, 2024
1 parent 68f8433 commit 121cb75
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ services:
```

* Run the build
* `docker-compose build .`
* If using `extends`: `docker-compose -f docker-compose.build.yml build`
* Start the container: `docker-compose up -d`
* `docker compose build .`
* If using `extends`: `docker compose -f docker compose.build.yml build`
* Start the container: `docker compose up -d`
* Initally test the build by connecting to the ispconfig control panel: `http://<localhost>:8080`
* Do addition verification!
* Ideally, push your image to Docker Cloud
Expand Down
2 changes: 1 addition & 1 deletion build/bin/track
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ echo "dfasf"
rm -rf .git
git init
git add --all
git commit -m "docker-compose track : initial checkin" >/dev/null
git commit -m "docker compose track : initial checkin" >/dev/null
exit 0
fi

Expand Down
2 changes: 1 addition & 1 deletion hooks/build
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ OPTIONS=()
source "$DIR/pre_build"

[ -t 1 ] && OPTIONS+=(--progress tty)
docker-compose -f "$DIR/../build/docker-compose.build.yml" build "${OPTIONS[@]}" "$@"
docker compose -f "$DIR/../build/docker compose.build.yml" build "${OPTIONS[@]}" "$@"
4 changes: 2 additions & 2 deletions hooks/test
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ export CONTAINER="ispconfig-test"

function buildAndTest() {
YML=$1
UP="docker-compose -f test/$YML up --build --abort-on-container-exit --force-recreate --remove-orphans sut"
DOWN="docker-compose -f test/$YML down -v"
UP="docker compose -f test/$YML up --build --abort-on-container-exit --force-recreate --remove-orphans sut"
DOWN="docker compose -f test/$YML down -v"

if ! $UP; then
echo "Failed: \"$UP\""
Expand Down

0 comments on commit 121cb75

Please sign in to comment.