diff --git a/bin/osem-init.sh b/bin/osem-init.sh index 5e26965b..6aec7742 100755 --- a/bin/osem-init.sh +++ b/bin/osem-init.sh @@ -6,4 +6,4 @@ bundle check || bundle install --jobs=3 --retry=3 # Setup the app if it isn't already setup bundle exec rake setup:bootstrap # Start the app -foreman start +foreman start -p 3000 diff --git a/docker-compose.yml.dev-example b/docker-compose.yml.dev-example index a255c391..3d6fa7b2 100644 --- a/docker-compose.yml.dev-example +++ b/docker-compose.yml.dev-example @@ -5,13 +5,15 @@ services: image: postgres environment: PGDATA: /var/lib/postgresql/data/pgdata - web: - build: . - # env_file: dotenv.example + osem: + build: + context: . + args: + CONTAINER_USERID: 1000 command: /osem/bin/osem-init.sh depends_on: - database ports: - - 5000:5000 + - 3000:3000 volumes: - .:/osem diff --git a/docker-compose.yml.production-example b/docker-compose.yml.production-example index c682aa1b..e15206d8 100644 --- a/docker-compose.yml.production-example +++ b/docker-compose.yml.production-example @@ -7,21 +7,23 @@ services: PGDATA: /var/lib/postgresql/data/pgdata volumes: - database:/var/lib/postgresql/data/pgdata - web: + osem: build: . dockerfile: Dockerfile.production env_file: .env.production # see dotenv.example file depends_on: - database ports: - - 5000:5000 + - 3000:3000 volumes: - .:/osem - web-data:/osem/public/system + - web-assets:/osem/public/assets - web-logs:/osem/log # named volumes to persist data volumes: database: web-data: + web-assets: web-logs: