Merge pull request #762 from RobertFloor/develop

codidact · Feb 20, 2022 · be7c960 · be7c960
2 parents 58f099b + e7cb61c
commit be7c960
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,11 +4,13 @@ services:
     build:
       context: "."
       dockerfile: docker/Dockerfile.db
-    volumes:  
+    volumes:
       - ./docker/mysql:/var/lib/mysql
     env_file:
       - ${ENV_FILE_LOCATION}
     command: mysqld --default-authentication-plugin=mysql_native_password --skip-mysqlx
+    cap_add:
+      - SYS_NICE
 
   uwsgi:
     restart: always
@@ -21,6 +23,7 @@ services:
       - COMMUNITY_NAME=${COMMUNITY_NAME}
       - RAILS_ENV=${RAILS_ENV}
       - CONFIRMABLE_ALLOWED_ACCESS_DAYS=${CONFIRMABLE_ALLOWED_ACCESS_DAYS}
+      - LOCAL_DEV_PORT=${LOCAL_DEV_PORT}
     env_file:
       - ${ENV_FILE_LOCATION}
     ports:

diff --git a/docker/create_admin_and_community.rb b/docker/create_admin_and_community.rb
@@ -1,6 +1,7 @@
 # 1. Create the community
 community_name = ENV['COMMUNITY_NAME'] || 'Dinosaur Community'
 Community.create(name: community_name, host: "localhost:#{ENV['LOCAL_DEV_PORT']}")
+Rails.cache.clear
 
 # 2. Create the admin user, ensure doesn't require confirmation
 username = ENV['COMMUNITY_ADMIN_USERNAME'] || 'admin'