-
Notifications
You must be signed in to change notification settings - Fork 23
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #751 from alphagov/rename-imminence
Rename imminence to places-manager
- Loading branch information
Showing
4 changed files
with
20 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
imminence: bundle-imminence local-links-manager locations-api | ||
places-manager: bundle-places-manager local-links-manager locations-api | ||
$(GOVUK_DOCKER) run $@-lite bin/rake db:setup | ||
$(GOVUK_DOCKER) run $@-lite env RAILS_ENV=test bin/rake db:setup |
34 changes: 17 additions & 17 deletions
34
projects/imminence/docker-compose.yml → projects/places-manager/docker-compose.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,57 +1,57 @@ | ||
volumes: | ||
imminence-tmp: | ||
places-manager-tmp: | ||
|
||
x-imminence: &imminence | ||
x-places-manager: &places-manager | ||
build: | ||
context: . | ||
dockerfile: Dockerfile.govuk-base | ||
image: imminence | ||
image: places-manager | ||
stdin_open: true | ||
tty: true | ||
volumes: | ||
- ${GOVUK_ROOT_DIR:-~/govuk}:/govuk:delegated | ||
- root-home:/root | ||
- imminence-tmp:/govuk/imminence/tmp | ||
working_dir: /govuk/imminence | ||
- places-manager-tmp:/govuk/places-manager/tmp | ||
working_dir: /govuk/places-manager | ||
|
||
services: | ||
imminence-lite: | ||
<<: *imminence | ||
places-manager-lite: | ||
<<: *places-manager | ||
depends_on: | ||
- postgres-14-postgis | ||
- redis | ||
environment: | ||
DATABASE_URL: "postgis://postgres:password@postgres-14-postgis/imminence" | ||
TEST_DATABASE_URL: "postgis://postgres:password@postgres-14-postgis/imminence-test" | ||
DATABASE_URL: "postgis://postgres:password@postgres-14-postgis/places-manager" | ||
TEST_DATABASE_URL: "postgis://postgres:password@postgres-14-postgis/places-manager-test" | ||
REDIS_URL: redis://redis | ||
|
||
imminence-app: &imminence-app | ||
<<: *imminence | ||
places-manager-app: &places-manager-app | ||
<<: *places-manager | ||
depends_on: | ||
- postgres-14-postgis | ||
- local-links-manager-app | ||
- locations-api-app | ||
- nginx-proxy | ||
- redis | ||
- imminence-worker | ||
- places-manager-worker | ||
environment: | ||
DATABASE_URL: "postgis://postgres:password@postgres-14-postgis/imminence" | ||
VIRTUAL_HOST: imminence.dev.gov.uk | ||
DATABASE_URL: "postgis://postgres:password@postgres-14-postgis/places-manager" | ||
VIRTUAL_HOST: places-manager.dev.gov.uk | ||
BINDING: 0.0.0.0 | ||
REDIS_URL: redis://redis | ||
expose: | ||
- "3000" | ||
command: bin/rails s --restart | ||
|
||
imminence-worker: | ||
<<: *imminence | ||
places-manager-worker: | ||
<<: *places-manager | ||
depends_on: | ||
- postgres-14-postgis | ||
- local-links-manager-app | ||
- locations-api-app | ||
- nginx-proxy | ||
- redis | ||
environment: | ||
DATABASE_URL: "postgis://postgres:password@postgres-14-postgis/imminence" | ||
DATABASE_URL: "postgis://postgres:password@postgres-14-postgis/places-manager" | ||
REDIS_URL: redis://redis | ||
command: bundle exec sidekiq -C ./config/sidekiq.yml |