Merge branch 'fix/docker' into fix/add-to-our-mailing-list

ontoportal · Dec 28, 2022 · 55d8627 · 55d8627
2 parents a0352e8 + 2972ffc
commit 55d8627
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -40,9 +40,10 @@ RUN bundle install --jobs "$(nproc)"
 RUN echo "--modules-folder /node_modules" > .yarnrc
 COPY --chown=ruby:ruby package.json *yarn* ./
 RUN yarn install
+RUN gem install rails
 
-ENTRYPOINT ["/app/bin/docker-entrypoint-web"]
+# ENTRYPOINT ["/app/bin/docker-entrypoint-web"]
 
 EXPOSE 3000
 
-CMD ["sh"]
+CMD ["/bin/bash"]
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -29,6 +29,9 @@ services:
     profiles: ["db"]
     ports:
       - "3306:3306"
+    volumes:
+      - db-v:/var/lib/mysql
+
   cache:
     deploy:
       resources:
@@ -45,5 +48,6 @@ services:
     profiles: ["web"]
     command: "yarn build --watch"
 volumes:
+  db-v:
   bundle:
   node: