Skip to content

Commit

Permalink
docker-compose to docker compose
Browse files Browse the repository at this point in the history
  • Loading branch information
ghidalgo3 committed Aug 13, 2024
1 parent 30fa810 commit c1602a3
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 16 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ A homepage, data catalog, and visualizations for the Planetary Computer.
## Requirements

- Docker
- docker-compose

## Getting started

Expand Down
1 change: 0 additions & 1 deletion etl/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ Read more about that build process in the [`docs README`](../docs/README.md).
## Dependencies

- Docker
- docker-compose

## Process notebook, markdown, and doc files

Expand Down
4 changes: 2 additions & 2 deletions scripts/cibuild
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
if [[ "${1:-}" == "--help" ]]; then
usage
else
docker-compose \
docker compose \
-f docker-compose.yml \
run --rm --no-deps app \
npm run build

docker-compose \
docker compose \
-f docker-compose.yml \
run --rm --no-deps app \
cp staticwebapp.config.json build/
Expand Down
2 changes: 1 addition & 1 deletion scripts/clean
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
if [[ "${1:-}" == "--help" ]]; then
usage
else
docker-compose run --rm --entrypoint ./scripts/clean etl
docker compose run --rm --entrypoint ./scripts/clean etl
fi
fi
4 changes: 2 additions & 2 deletions scripts/format
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ Run formatters on python and JS files

function run() {

docker-compose run --rm --no-deps api black --check .
docker-compose run --rm --no-deps app npm run format-fix
docker compose run --rm --no-deps api black --check .
docker compose run --rm --no-deps app npm run format-fix
}

if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion scripts/mockstac
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
if [[ "${1:-}" == "--help" ]]; then
usage
else
docker-compose up mockstac && docker-compose rm -fs
docker compose up mockstac && docker compose rm -fs
fi
fi
4 changes: 2 additions & 2 deletions scripts/server
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
if [[ "${1:-}" == "--help" ]]; then
usage
elif [[ "${1:-}" == "--api" ]]; then
docker-compose up app api
docker compose up app api
else
docker-compose up app
docker compose up app
fi
fi
6 changes: 3 additions & 3 deletions scripts/test
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
if [[ "${1:-}" == "--help" ]]; then
usage
else
docker-compose \
docker compose \
run --rm --no-deps app \
npm run lint

docker-compose \
docker compose \
run --rm --no-deps app \
npm run format

docker-compose \
docker compose \
run --rm --no-deps \
-e CI="${CI}" \
app \
Expand Down
6 changes: 3 additions & 3 deletions scripts/update
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ Options:
function run() {

# Install JS dependencies on host
docker-compose \
docker compose \
-f docker-compose.yml \
run --rm --no-deps app \
npm install

# Ensure container images are current
docker-compose build
docker compose build

# Run etl to build documentation and external notebook/md files
docker-compose run --rm --no-deps etl "${params[@]}"
docker compose run --rm --no-deps etl "${params[@]}"
}

params=()
Expand Down

0 comments on commit c1602a3

Please sign in to comment.