Skip to content

Commit

Permalink
Migrate compose filenames and commands to modern forms
Browse files Browse the repository at this point in the history
* docker-compose commands are obsolete
* docker-compose.yml is superceded by compose.yml
  • Loading branch information
mfisher87 committed Feb 9, 2024
1 parent 68dd0dd commit c6aa4da
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Docker stuff
docker-compose.override.yml
*compose.override.yml

# Python stuff
__pycache__
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ creating Cloud-Optimized GeoTIFFs.
## Installation

```
docker-compose build
docker compose build
```


Expand All @@ -52,7 +52,7 @@ arrive, and `cogs` and `plots` directories, where outputs will be written.
### Start the data server

```
docker-compose up -d data-server
docker compose up -d data-server
```

### Ingest data
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 5 additions & 5 deletions deploy/deploy
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@ cat "$VERSION_FILE"
source "$VERSION_FILE"

# Symlink correct compose override
ln -sf docker-compose.live.yml docker-compose.override.yml
ln -sf compose.live.yml compose.override.yml

# Pull new server version
docker-compose pull data-server
docker compose pull data-server

# Cleanup old containers
docker-compose down --remove-orphans
docker compose down --remove-orphans

# Start the new server version
docker-compose up -d data-server
docker compose up -d data-server

# Cleanup old images
docker system prune -af

# Pull new ingest container (this is for execution by ops on schedule)
docker-compose pull ingest
docker compose pull ingest
2 changes: 1 addition & 1 deletion doc/how-to/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ python ./snow_today_webapp_ingest/cli.py
Override compose configuration with the dev compose-file:

```
ln -s docker-compose.dev.yml docker-compose.override.yml
ln -s compose.dev.yml compose.override.yml
./scripts/container_cli.sh
```

0 comments on commit c6aa4da

Please sign in to comment.