Mercurial > hg > soundsoftware-site
changeset 1583:0dcd4f8c2b8a dockerise
Small update, commit Gemfile.lock
| author | Chris Cannam |
|---|---|
| date | Wed, 16 Aug 2017 12:29:01 +0100 |
| parents | f26dc3004b3f |
| children | 8b1dc5e31dbc |
| files | .hgignore Gemfile.lock extra/soundsoftware/scripted-deploy/vagrant/Vagrantfile extra/soundsoftware/scripted-deploy/vagrant/provision.d/000-system-packages.sh plugins/redmine_bibliography/Gemfile |
| diffstat | 5 files changed, 187 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Tue Aug 15 16:26:46 2017 +0100 +++ b/.hgignore Wed Aug 16 12:29:01 2017 +0100 @@ -34,7 +34,6 @@ *~ public/themes/soundsoftware/stylesheets/fonts/* .bundle -Gemfile.lock Gemfile.local *.interpolated re:^config\.ru$
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Gemfile.lock Wed Aug 16 12:29:01 2017 +0100 @@ -0,0 +1,175 @@ +GEM + remote: https://rubygems.org/ + specs: + actionmailer (3.2.22.5) + actionpack (= 3.2.22.5) + mail (~> 2.5.4) + actionpack (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) + builder (~> 3.0.0) + erubis (~> 2.7.0) + journey (~> 1.0.4) + rack (~> 1.4.5) + rack-cache (~> 1.2) + rack-test (~> 0.6.1) + sprockets (~> 2.2.1) + activemodel (3.2.22.5) + activesupport (= 3.2.22.5) + builder (~> 3.0.0) + activerecord (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) + arel (~> 3.0.2) + tzinfo (~> 0.3.29) + activeresource (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) + activesupport (3.2.22.5) + i18n (~> 0.6, >= 0.6.4) + multi_json (~> 1.0) + acts-as-taggable-on (2.3.3) + rails (~> 3.0) + arel (3.0.3) + awesome_nested_set (2.1.6) + activerecord (>= 3.0.0) + bibtex-ruby (4.4.4) + latex-decode (~> 0.0) + builder (3.0.0) + capybara (2.1.0) + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + childprocess (0.7.1) + ffi (~> 1.0, >= 1.0.11) + citeproc (1.0.5) + namae (~> 0.8) + citeproc-ruby (1.1.7) + citeproc (>= 1.0.4, < 2.0) + csl (~> 1.4) + coderay (1.1.1) + csl (1.4.5) + namae (~> 0.7) + csl-styles (1.0.1.8) + csl (~> 1.0) + erubis (2.7.0) + fastercsv (1.5.5) + ffi (1.9.18) + hike (1.2.3) + i18n (0.8.6) + journey (1.0.4) + jquery-rails (2.0.3) + railties (>= 3.1.0, < 5.0) + thor (~> 0.14) + json (1.8.6) + latex-decode (0.2.2) + unicode (~> 0.4) + mail (2.5.5) + mime-types (~> 1.16) + treetop (~> 1.4.8) + metaclass (0.0.4) + mime-types (1.25.1) + mini_portile2 (2.2.0) + mocha (1.0.0) + metaclass (~> 0.0.1) + multi_json (1.12.1) + namae (0.11.3) + net-ldap (0.3.1) + nokogiri (1.8.0) + mini_portile2 (~> 2.2.0) + pg (0.21.0) + polyglot (0.3.5) + rack (1.4.7) + rack-cache (1.7.0) + rack (>= 0.4) + rack-openid (1.4.2) + rack (>= 1.1.0) + ruby-openid (>= 2.1.8) + rack-ssl (1.3.4) + rack + rack-test (0.6.3) + rack (>= 1.0) + rails (3.2.22.5) + actionmailer (= 3.2.22.5) + actionpack (= 3.2.22.5) + activerecord (= 3.2.22.5) + activeresource (= 3.2.22.5) + activesupport (= 3.2.22.5) + bundler (~> 1.0) + railties (= 3.2.22.5) + railties (3.2.22.5) + actionpack (= 3.2.22.5) + activesupport (= 3.2.22.5) + rack-ssl (~> 1.3.2) + rake (>= 0.8.7) + rdoc (~> 3.4) + thor (>= 0.14.6, < 2.0) + rake (10.1.1) + rdoc (3.12.2) + json (~> 1.4) + redcarpet (2.3.0) + rmagick (2.16.0) + ruby-openid (2.3.0) + rubyzip (1.2.1) + selenium-webdriver (3.5.1) + childprocess (~> 0.5) + rubyzip (~> 1.0) + shoulda (3.3.2) + shoulda-context (~> 1.0.1) + shoulda-matchers (~> 1.4.1) + shoulda-context (1.0.2) + shoulda-matchers (1.4.1) + activesupport (>= 3.0.0) + sprockets (2.2.3) + hike (~> 1.2) + multi_json (~> 1.0) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) + thor (0.19.4) + tilt (1.4.1) + treetop (1.4.15) + polyglot + polyglot (>= 0.3.1) + tzinfo (0.3.53) + unicode (0.4.4.4) + xpath (2.1.0) + nokogiri (~> 1.3) + yard (0.9.9) + +PLATFORMS + ruby + +DEPENDENCIES + activerecord-jdbc-adapter (~> 1.3.2) + activerecord-jdbcpostgresql-adapter + acts-as-taggable-on (= 2.3.3) + awesome_nested_set (= 2.1.6) + bibtex-ruby + builder (= 3.0.0) + capybara (~> 2.1.0) + citeproc + citeproc-ruby + coderay (~> 1.1.0) + csl-styles + fastercsv (~> 1.5.0) + jquery-rails (~> 2.0.2) + mime-types + mocha (~> 1.0.0) + net-ldap (~> 0.3.1) + nokogiri + pg (>= 0.11.0) + rack-openid + rails (~> 3.2.22) + rake (~> 10.1.1) + rdoc (>= 2.4.2) + redcarpet (~> 2.3.0) + rmagick (>= 2.0.0) + ruby-openid (~> 2.3.0) + selenium-webdriver + shoulda (~> 3.3.2) + yard + +BUNDLED WITH + 1.15.3
--- a/extra/soundsoftware/scripted-deploy/vagrant/Vagrantfile Tue Aug 15 16:26:46 2017 +0100 +++ b/extra/soundsoftware/scripted-deploy/vagrant/Vagrantfile Wed Aug 16 12:29:01 2017 +0100 @@ -2,8 +2,7 @@ # vi: set ft=ruby : Vagrant.configure("2") do |config| -# config.vm.box = "ubuntu/xenial64" - config.vm.box = "centos/7" + config.vm.box = "ubuntu/xenial64" config.vm.network "forwarded_port", guest: 80, host: 8080 config.vm.synced_folder "../../../..", "/vagrant-code" config.vm.provision :shell, path: "vagrant-provision.sh"
--- a/extra/soundsoftware/scripted-deploy/vagrant/provision.d/000-system-packages.sh Tue Aug 15 16:26:46 2017 +0100 +++ b/extra/soundsoftware/scripted-deploy/vagrant/provision.d/000-system-packages.sh Wed Aug 16 12:29:01 2017 +0100 @@ -4,7 +4,12 @@ if [ -x /usr/bin/yum ]; then - # assumption: CentOS 7 + # Assumption: CentOS 7 + + # This doesn't work -- I got hung up on the problem of making a + # sufficiently recent Ruby act as the system /usr/bin/ruby without + # massively overcomplicating things, and decided not to persist + # with it yum install -y epel-release centos-release-scl && \ yum update -y && \ @@ -36,7 +41,9 @@ else - # assumption: Ubuntu 16.04 + # Assumption: Ubuntu 16.04 + + # This is the working one! apt-get update && \ apt-get dist-upgrade -y && \