[devdocsgjs/build] Fix Docker build




commit a0580e478f9449e57892cf5ce9e5ee3c11a16f22
Author: Meg Ford <mford pixability com>
Date:   Tue Apr 13 15:02:49 2021 -0500

    Fix Docker build

 Dockerfile | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)
---
diff --git a/Dockerfile b/Dockerfile
index e7406555..68f8bd7d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV LC_ALL en_US.UTF-8
 # Build dependencies and GIR packages
 RUN dnf install -y 'dnf-command(builddep)' @development-tools bzip2 gcc-c++ && \
     dnf builddep -y ruby && \
-    dnf install -y python3-markdown \
+    dnf install -y ruby-devel python3-markdown \
         NetworkManager-libnm-devel cairo-devel cheese-libs-devel \
         clutter-{gst3,gtk}-devel evince-devel folks-devel geoclue2-devel \
         geocode-glib-devel glib2-devel gnome-bluetooth-libs-devel \
@@ -47,23 +47,24 @@ COPY lib/docs/scrapers/gnome/girs/mutter-6 /usr/lib64/mutter-6
 COPY lib/docs/scrapers/gnome/girs/mutter-7 /usr/lib64/mutter-7
 
 COPY . /opt/devdocs/
+RUN bash -s  gem install bundler
 WORKDIR /opt/devdocs
-RUN rbenv install
-RUN gem install bundler
-RUN bundle install --deployment
-
-RUN bundle exec thor gir:generate_all /usr/share/gir-1.0
-RUN bundle exec thor gir:generate_all /usr/lib64/mutter-3
-RUN bundle exec thor gir:generate_all /usr/lib64/mutter-4
-RUN bundle exec thor gir:generate_all /usr/lib64/mutter-5
-RUN bundle exec thor gir:generate_all /usr/lib64/mutter-6
-RUN bundle exec thor gir:generate_all /usr/lib64/mutter-7
-RUN bundle exec thor gir:generate_all /usr/lib64/mutter-8
+RUN bash -s bundle config set --local deployment 'true'
+RUN bash -s bundle install
+
+
+RUN bash -s  bundle exec thor gir:generate_all /usr/share/gir-1.0
+RUN bash -s  bundle exec thor gir:generate_all /usr/lib64/mutter-3
+RUN bash -s  bundle exec thor gir:generate_all /usr/lib64/mutter-4
+RUN bash -s bundle exec thor gir:generate_all /usr/lib64/mutter-5
+RUN bash -s bundle exec thor gir:generate_all /usr/lib64/mutter-6
+RUN bash -s bundle exec thor gir:generate_all /usr/lib64/mutter-7
+RUN bash -s bundle exec thor gir:generate_all /usr/lib64/mutter-8
 
 # Some of the gnome-shell GIRs need extra include paths
-RUN bundle exec thor gir:generate /usr/share/gnome-shell/Gvc-1.0.gir
-RUN bundle exec thor gir:generate /usr/share/gnome-shell/Shell-0.1.gir --include /usr/lib64/mutter-8
-RUN bundle exec thor gir:generate /usr/share/gnome-shell/St-1.0.gir --include /usr/lib64/mutter-8
+RUN bash -s bundle exec thor gir:generate /usr/share/gnome-shell/Gvc-1.0.gir
+RUN bash -s bundle exec thor gir:generate /usr/share/gnome-shell/Shell-0.1.gir --include /usr/lib64/mutter-8
+RUN bash -s bundle exec thor gir:generate /usr/share/gnome-shell/St-1.0.gir --include /usr/lib64/mutter-8
 
 RUN for docset in appindicator301 appstreamglib10 atk10 atspi20 cairo10 \
         cally10 cally8 camel12 champlain012 cheese30 clutter10 clutter8 \
@@ -92,7 +93,7 @@ RUN for docset in appindicator301 appstreamglib10 atk10 atspi20 cairo10 \
         cally5 clutter5 clutterx115 cogl5 coglpango5 meta5 \
         cally6 clutter6 clutterx116 cogl6 coglpango6 meta6 \
         cally7 clutter7 clutterx117 cogl7 coglpango7 meta7; \
-      do echo $docset; bundle exec thor docs:generate $docset --force; done
+      do echo $docset; bash -s bundle exec thor docs:generate $docset --force; done
 
 # Intentionally omitted:
 # dbus10, dbusglib10, fontconfig20, freetype220, gdkpixdata20, gl10, libxml220,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]