From 48452f90dc25e83a18d35da2b3c1bd2ad0eab009 Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <the@jeffreyfreeman.me>
Date: Tue, 14 Apr 2020 10:35:16 -0400
Subject: [PATCH] Updated docker image to correctly render unicode characters.
---
.gitignore | 2 ++
Dockerfile | 13 ++++++++-----
README.rdoc | 2 +-
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
index 2efefbd..eba1ec5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ results.html
.idea/
nbproject/
lib/aethyr/extensions/reactions/
+.bundle/
+vendor/
diff --git a/Dockerfile b/Dockerfile
index d235bb5..2ca6a06 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,19 +1,22 @@
-FROM ruby:2.6
+FROM archlinux/base
-# throw errors if Gemfile has been modified since Gemfile.lock
-RUN bundle config --global frozen 1
+RUN pacman -Sy --noconfirm
+RUN pacman -S --noconfirm ruby git
RUN gem install bundler
+# throw errors if Gemfile has been modified since Gemfile.lock
+RUN /root/.gem/ruby/2.7.0/bin/bundle config --global frozen 1
+
WORKDIR /usr/src/app
COPY . .
RUN rm -rf storage && rm -rf lib/aethyr/extensions/reactions
-RUN bundle install
+RUN /root/.gem/ruby/2.7.0/bin/bundle install
#RUN bundle update --bundler
#cleanup
RUN rm -rf .git
EXPOSE 8888
-CMD ["bundle", "exec", "./bin/aethyr", "run"]
+CMD ["/root/.gem/ruby/2.7.0/bin/bundle", "exec", "./bin/aethyr", "run"]
diff --git a/README.rdoc b/README.rdoc
index 87f74a6..5575c37 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -26,7 +26,7 @@ Just run the application with the following command.
== From source
- bundle install
+ bundle install --path vendor/bundle
bundle exec rake
bundle exec ./bin/aethyr_setup
bundle exec ./bin/aethyr run
--
GitLab