imagine_cms 5.2.0 → 5.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a2d2087d9caf255378b1213b70ef79ce96674fd68158faa3d175a0efcc49bcb
-  data.tar.gz: 3d26b91a3140cc36df6ce24dcd8aa0c8042d178a1596d152990bab1f8da6aba4
+  metadata.gz: 8bcd149b6bf5e054f02e3e7e05914945359aa56a5e3886064a7a880c48277c4d
+  data.tar.gz: 1d2e69ce6b6f4654788a81c5c2ec91f219932ce2a57fbfca0ae0addb780c174d
 SHA512:
-  metadata.gz: 4cd0d6ba6f816b5d8a4de2f63f5947bac71a4ee02ece4fa26af8d79db2b87c5d2360d7eb5f863ddb0667615e41731473a8d77d6ea0b3c5f013e751d8b86bd0ab
-  data.tar.gz: 28b07e811ffd01c9df9db417f75bfc782f44c72779441a2a70aab854c59d2f222ad4433d8492a7d0ff94b4c47b7f1efbe2882a20fbde7e4b9f78cf69fba197d6
+  metadata.gz: 52d088e7e5f6f5879c98aa933d3f0c8ccc59b077e38b83fdb909383a0cc1d8f8717bc98e8e9590b8e4f0d1a6119a313d7c5ebbfc3ba4332e313a04256e827dd8
+  data.tar.gz: 36f21b1b084531fb055e0ff19efbc1b2d850d01e3ccbb0e312b74b6aeea611b64c49db5a0fe0268415260e54fd483ddb0a3fcc876272f56cab7d5c39d3ab1d26

data/Dockerfile

@@ -1,61 +1,34 @@
 ### Docker image for imagine5 ###
 
-# See https://github.com/phusion/passenger-docker/blob/master/Changelog.md for a list of version numbers.
-FROM phusion/passenger-ruby25:1.0.0
-LABEL maintainer="aaron@aaronnamba.com"
+# See https://hub.docker.com/r/anamba/rails-dev/tags/ for a list of tags
+FROM anamba/rails-dev:1.0
+LABEL maintainer="bbsoftware@biggerbird.com"
 
-# Set up 3rd party repos
-RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
-RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list
-
-# Update package list
+# Update package list and upgrade pre-installed packages
 RUN apt-get update
-
-# Upgrade other preinstalled packages
 RUN apt-get upgrade -y -o Dpkg::Options::="--force-confnew"
 
 # Install other packages we depend on
-RUN apt-get install -y nodejs yarn
-RUN apt-get install -y tzdata
 RUN apt-get install -y mysql-client
 RUN apt-get install -y libmagickcore-dev libmagickwand-dev  # for rmagick2 gem
 RUN apt-get install -y imagemagick                          # for mini-magick gem
 RUN apt-get install -y openjdk-8-jre-headless               # java for fop
-RUN apt-get install -y memcached                            # for rack-attack and rails cache
 RUN apt-get install -y cmake pkg-config                     # for rugged (git)
 RUN apt-get autoremove -y
 
-# Enable services
-RUN rm -f /etc/service/nginx/down
+# apt clean up
+RUN apt-get clean && rm -rf /tmp/* /var/tmp/*
+# RUN rm -rf /var/lib/apt/lists/*
 
-# Add custom services
-RUN mkdir /etc/service/memcached
-COPY docker/services/memcached.sh /etc/service/memcached/run
-# RUN mkdir /etc/service/sidekiq
-# COPY docker/services/sidekiq.sh /etc/service/sidekiq/run
-# RUN mkdir /etc/service/webpack
-# COPY docker/services/webpack.sh /etc/service/webpack/run
-
-# Other startup scripts
-RUN mkdir -p /etc/my_init.d
-COPY docker/startup/101_mkdir.sh /etc/my_init.d/
-COPY docker/startup/201_bundler.sh /etc/my_init.d/
-COPY docker/startup/211_yarn.sh /etc/my_init.d/
+# Add custom vhost
+COPY /docker/conf/nginx-vhost.conf.template /etc/nginx/
 
 # Remove the default vhost (so that ours will respond to any Host)
 RUN rm -f /etc/nginx/sites-enabled/default
 
-# Post-build clean up
-RUN apt-get clean && rm -rf /tmp/* /var/tmp/*
-# RUN rm -rf /var/lib/apt/lists/*
-
-# Expose port 80 to the Docker host, so we can access it from the outside (remember to publish it using `docker run -p`).
-EXPOSE 80
+# Add custom services
+RUN mkdir /etc/service/memcached
+COPY docker/services/memcached /etc/service/memcached/run
 
 # For convenience
-WORKDIR /home/app/myapp
 COPY docker/conf/.my.cnf /home/app
-
-# Run this to start all services (if no command was provided to `docker run`)
-CMD ["/sbin/my_init"]

data/app/assets/javascripts/dojo/src/widget/templates/richtextframe.html

@@ -8,6 +8,9 @@
 		<script type="text/javascript">
 			function init(){
 				document.designMode = 'on';
+				document.execCommand('enableObjectResizing', false, true);
+				document.execCommand('enableInlineTableEditing', false, true);
+				document.execCommand('enableAbsolutePositionEditor', false, true);
 				try{
 					parentPageDomain = document.location.href.split('#')[1];
 					if(parentPageDomain){

data/docker-compose.override.yml.example

@@ -14,7 +14,7 @@ services:
       # - ./prototype-rails:/home/app/prototype-rails:delegated  # when working on imagine dependency prototype-rails
       - log:/home/app/myapp/log
       - node_modules:/home/app/myapp/node_modules
-      - rvm:/usr/local/rvm
+      - gems:/usr/local/rvm/gems
       - ~/.gitconfig:/home/app/.gitconfig                        # if you want to commit from within the container
     # environment:
     #   PASSENGER_APP_ENV: production
@@ -36,7 +36,8 @@ volumes:
   log:
   node_modules:
   tmp:
-  rvm:
+  gems:
+    external: true
 
 # networks:
 #   traefik:

data/docker-compose.yml

@@ -3,8 +3,6 @@ version: '3'
 services:
   web:  # (passenger + sidekiq)
     build: .
-    volumes:
-      - ./docker/conf/nginx-vhost.conf:/etc/nginx/sites-enabled/webapp.conf:delegated
     environment:
       PASSENGER_APP_ENV: development
       MYSQL_HOST: db                    # if this is changed, update nginx-vhost.conf as well

data/docker/conf/{nginx-vhost.conf → nginx-vhost.conf.template}

@@ -7,8 +7,8 @@ server {
     passenger_user app;
 
     passenger_ruby /usr/bin/ruby2.5;
-    passenger_env_var MYSQL_HOST db;  # keep this in sync with value in docker-compose.yml
-    passenger_env_var REDIS_URL redis://redis:6379/1;
+    passenger_env_var MYSQL_HOST '$MYSQL_HOST';
+    passenger_env_var REDIS_URL '$REDIS_URL';
 
     client_max_body_size 100M;
 }

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "5.2.0"
+  VERSION = "5.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imagine_cms
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.2.1
 platform: ruby
 authors:
 - Aaron Namba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-22 00:00:00.000000000 Z
+date: 2019-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -492,10 +492,10 @@ files:
 - docker/conf/.my.cnf
 - docker/conf/my.local.cnf
 - docker/conf/my.prod.cnf
-- docker/conf/nginx-vhost.conf
-- docker/services/memcached.sh
-- docker/services/sidekiq.sh
-- docker/services/webpack.sh
+- docker/conf/nginx-vhost.conf.template
+- docker/services/memcached
+- docker/services/sidekiq
+- docker/services/webpack
 - docker/startup/101_mkdir.sh
 - docker/startup/201_bundler.sh
 - docker/startup/211_yarn.sh