Skip to content

Commit

Permalink
Use version numbers for plugins
Browse files Browse the repository at this point in the history
Fixes issues related to users having the wrong versions of images. Now
we must explicitly release new plugins and new versions of Overview by
editing `config/overview.yml`.

Also: I have audited all plugins, and they all respect the `origin` vs
`server` distinction.
  • Loading branch information
adamhooper committed Jan 18, 2018
1 parent 67ff24e commit 06cc600
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 31 deletions.
27 changes: 17 additions & 10 deletions config/overview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3'
services:
# === core services ===
overview-worker:
image: overview/overview-worker
image: overview/overview-worker:0b720d8672ee371d853d48bdd5986957b4cada21
volumes:
- overview-blob-storage:/var/lib/overview/blob-storage
- overview-searchindex-data:/var/lib/overview/searchindex
Expand All @@ -11,7 +11,7 @@ services:
- overview.env

overview-web:
image: overview/overview-web
image: overview/overview-web:0b720d8672ee371d853d48bdd5986957b4cada21
volumes:
- overview-blob-storage:/var/lib/overview/blob-storage
env_file:
Expand All @@ -20,32 +20,39 @@ services:

# === internal dependencies ===
overview-database:
image: overview/overview-database
image: overview/overview-database:0b720d8672ee371d853d48bdd5986957b4cada21
volumes:
- overview-database-data:/var/lib/postgresql/data

overview-db-evolution-applier:
image: overview/overview-db-evolution-applier:0b720d8672ee371d853d48bdd5986957b4cada21
depends_on: [ 'overview-database' ]
env_file:
- overview.defaults.env
- overview.env

overview-redis:
image: overview/overview-redis
image: overview/overview-redis:0b720d8672ee371d853d48bdd5986957b4cada21

# === plugins ===
overview-plugin-entity-filter:
image: overview/overview-entity-filter
image: overview/overview-entity-filter:1.0.3

overview-plugin-file-browser:
image: overview/overview-file-browser
image: overview/overview-file-browser:1.0.3

overview-plugin-metadata:
image: overview/overview-plugin-metadata
image: overview/overview-plugin-metadata:1.0.3

overview-plugin-multi-search:
image: overview/overview-multi-search
image: overview/overview-multi-search:1.0.2

overview-plugin-word-cloud:
image: overview/overview-word-cloud
image: overview/overview-word-cloud:1.0.1

# === proxy -- which binds them all
overview-proxy:
image: overview/overview-proxy
image: overview/overview-proxy:latest
volumes:
- overview-acme:/var/lib/acme
env_file:
Expand Down
9 changes: 1 addition & 8 deletions start-after-git-pull
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,8 @@ NETWORK="overviewlocal_default"
. "$DIRNAME"/lib/upgrade-obsolete-volumes.sh
migrate_volumes_if_needed

echo "Launching database..."
$DOCKER_COMPOSE up --remove-orphans -d overview-database

echo "Applying latest schema..."
docker run \
--net "$NETWORK" \
--env-file "$CONFIG"/overview.defaults.env \
--env-file "$CONFIG"/overview.env \
--rm overview/overview-db-evolution-applier
$DOCKER_COMPOSE run --rm overview-db-evolution-applier

echo "Launching Overview..."
$DOCKER_COMPOSE up --remove-orphans -d
Expand Down
15 changes: 2 additions & 13 deletions update
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,5 @@

docker pull "$BUSYBOX_IMAGE"
docker pull "$UBUNTU_IMAGE"
docker pull overview/overview-db-evolution-applier:latest
docker pull overview/overview-database:latest
docker pull overview/overview-redis:latest
docker pull overview/overview-web:latest
docker pull overview/overview-worker:latest
docker pull overview/overview-word-cloud:latest
docker pull overview/overview-entity-filter:latest
docker pull overview/overview-grep:latest
docker pull overview/overview-file-browser:latest
docker pull overview/overview-multi-search:latest
docker pull overview/overview-plugin-metadata:latest
docker pull overview/overview-proxy:latest
docker pull overview/plugin-setup:latest
docker pull overview/overview-proxy:latest # TODO use version number
$DOCKER_COMPOSE pull --parallel

0 comments on commit 06cc600

Please sign in to comment.