You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2018/12/24 22:19:26 UTC

[trafficcontrol] branch master updated: fixes compass so the scss files can be compiled to css (#3162)

This is an automated email from the ASF dual-hosted git repository.

dangogh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git


The following commit(s) were added to refs/heads/master by this push:
     new 37f4de4  fixes compass so the scss files can be compiled to css (#3162)
37f4de4 is described below

commit 37f4de48834ff0deaecbe358bdf8f41b5009b9eb
Author: Jeremy Mitchell <mi...@users.noreply.github.com>
AuthorDate: Mon Dec 24 15:19:22 2018 -0700

    fixes compass so the scss files can be compiled to css (#3162)
---
 infrastructure/docker/build/Dockerfile-traffic_portal | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/infrastructure/docker/build/Dockerfile-traffic_portal b/infrastructure/docker/build/Dockerfile-traffic_portal
index 8d8d9b9..1380ca8 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_portal
+++ b/infrastructure/docker/build/Dockerfile-traffic_portal
@@ -37,20 +37,11 @@ RUN	yum -y install \
 		libffi-devel \
 		make \
 		nodejs \
-		npm
+		npm \
+		ruby-devel \
+		rubygems
 
-# NOTE: error installing with default ruby 2.0.0.   This allows us to upgrade to 2.3
-RUN	yum -y install \
-		centos-release-scl \
-		openssl-devel && \
-	yum -y install \
-		rh-ruby23 \
-		rh-ruby23-ruby-devel \
-		rh-ruby23-runygems
-
-RUN	. /opt/rh/rh-ruby23/enable && \
-	gem update --system --no-document && \
-	gem install rb-inotify && \
+RUN	gem install rb-inotify -v 0.9.10 && \
 	gem install compass && \
 	npm -g install bower grunt-cli