From 2e11ab3d97836869bf109d23ce69092009aad767 Mon Sep 17 00:00:00 2001 From: Ryan Baumann Date: Tue, 2 Nov 2021 10:40:12 -0400 Subject: [PATCH 1/4] Update Dockerfile and anonymous git clone behavior (cherry picked from commit 530e211f9a6665ba104084fb2e2536cf9a9279d9) --- Dockerfile | 13 ++++++------- config/externals.yml | 6 +++--- lib/tasks/git.rake | 4 ++-- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 63bfa7fc4..ca0f0a87b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:xenial +FROM ubuntu:focal MAINTAINER Ryan Baumann # Install the Ubuntu packages. @@ -8,8 +8,8 @@ MAINTAINER Ryan Baumann ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ apt-get install -y git wget subversion curl \ - autoconf bison build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm3 libgdbm-dev locales \ - openjdk-8-jre + autoconf bison build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm6 libgdbm-dev locales \ + openjdk-11-jre # Set the locale. RUN locale-gen en_US.UTF-8 @@ -19,12 +19,11 @@ ENV LC_ALL en_US.UTF-8 WORKDIR /root # Install rbenv/ruby-build -RUN git clone git://github.com/sstephenson/rbenv.git .rbenv +RUN git clone https://github.com/rbenv/rbenv.git .rbenv ENV PATH /root/.rbenv/bin:/root/.rbenv/shims:$PATH RUN echo 'eval "$(rbenv init -)"' > /etc/profile.d/rbenv.sh RUN chmod +x /etc/profile.d/rbenv.sh -RUN git clone git://github.com/sstephenson/ruby-build.git #.rbenv/plugins/ruby-build -RUN cd ruby-build; ./install.sh +RUN git clone https://github.com/rbenv/ruby-build.git "$(rbenv root)"/plugins/ruby-build && cd "$(rbenv root)"/plugins/ruby-build && git checkout 9ae5198 RUN git clone https://github.com/rbenv/rbenv-vars.git $(rbenv root)/plugins/rbenv-vars # Copy in secret files @@ -34,7 +33,7 @@ RUN git clone https://github.com/rbenv/rbenv-vars.git $(rbenv root)/plugins/rben ADD . /root/sosol/ WORKDIR /root/sosol -RUN rbenv install && rbenv rehash && gem install bundler:2.2.10 && rbenv rehash && bundle install && jruby -v && java -version && touch config/environments/development_secret.rb config/environments/production_secret.rb config/environments/test_secret.rb +RUN rbenv install && rbenv rehash && gem install bundler:2.2.28 && rbenv rehash && bundle install && jruby -v && java -version && touch config/environments/development_secret.rb config/environments/production_secret.rb config/environments/test_secret.rb RUN RAILS_ENV=test ./script/setup # Finally, start the application diff --git a/config/externals.yml b/config/externals.yml index 044e555b5..a1cb9c0e7 100644 --- a/config/externals.yml +++ b/config/externals.yml @@ -1,14 +1,14 @@ lib/rxsugar: :type: git - :repository: git://github.com/papyri/xsugar.git + :repository: https://github.com/papyri/xsugar.git :revision: master data/xslt/epidoc: :type: git - :repository: git://github.com/DCLP/epidoc-xslt.git + :repository: https://github.com/DCLP/epidoc-xslt.git :revision: 97e957091d135ec6f8f169c13bdc8e279f26f00b data/xslt/pn/navigator: :type: git - :repository: git://github.com/DCLP/navigator.git + :repository: https://github.com/DCLP/navigator.git :revision: f6d9bb08e524f3291fcddbbf4e108e55151ae035 diff --git a/lib/tasks/git.rake b/lib/tasks/git.rake index 19e546fd0..50694908a 100644 --- a/lib/tasks/git.rake +++ b/lib/tasks/git.rake @@ -19,9 +19,9 @@ namespace :git do require File.expand_path('../../../config/boot', __FILE__) if ENV['RAILS_ENV'] == "test" - CANONICAL_CLONE_URL = "git://github.com/ryanfb/idp.data.test.git" + CANONICAL_CLONE_URL = "https://github.com/ryanfb/idp.data.test.git" else - CANONICAL_CLONE_URL = "git://github.com/papyri/idp.data.git" + CANONICAL_CLONE_URL = "https://github.com/papyri/idp.data.git" end if !File.exist?(Sosol::Application.config.canonical_repository) From 3d8e60644a7fd5704fc1f4a4b6b5363497472e24 Mon Sep 17 00:00:00 2001 From: "Hugh A. Cayless" Date: Mon, 29 Nov 2021 17:20:43 -0500 Subject: [PATCH 2/4] Change back to EpiDoc XSLT and papyri navigator --- config/externals.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/externals.yml b/config/externals.yml index a1cb9c0e7..eb3d8c3e5 100644 --- a/config/externals.yml +++ b/config/externals.yml @@ -5,10 +5,10 @@ lib/rxsugar: data/xslt/epidoc: :type: git - :repository: https://github.com/DCLP/epidoc-xslt.git - :revision: 97e957091d135ec6f8f169c13bdc8e279f26f00b + :repository: https://github.com/EpiDoc/Stylesheets.git + :revision: 06062b8c98b421a4c34421e66491b62b88715f9a data/xslt/pn/navigator: :type: git - :repository: https://github.com/DCLP/navigator.git - :revision: f6d9bb08e524f3291fcddbbf4e108e55151ae035 + :repository: https://github.com/papyri/navigator.git + :revision: 50a8d888f2c03701a4216cb1a2c3890bf3de89b1 From 762a00c486e1be11e03da9942669b498804a3f2a Mon Sep 17 00:00:00 2001 From: Ryan Baumann Date: Wed, 1 Dec 2021 09:51:13 -0500 Subject: [PATCH 3/4] Revert "Change back to EpiDoc XSLT and papyri navigator" This reverts commit 3d8e60644a7fd5704fc1f4a4b6b5363497472e24. --- config/externals.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/externals.yml b/config/externals.yml index eb3d8c3e5..a1cb9c0e7 100644 --- a/config/externals.yml +++ b/config/externals.yml @@ -5,10 +5,10 @@ lib/rxsugar: data/xslt/epidoc: :type: git - :repository: https://github.com/EpiDoc/Stylesheets.git - :revision: 06062b8c98b421a4c34421e66491b62b88715f9a + :repository: https://github.com/DCLP/epidoc-xslt.git + :revision: 97e957091d135ec6f8f169c13bdc8e279f26f00b data/xslt/pn/navigator: :type: git - :repository: https://github.com/papyri/navigator.git - :revision: 50a8d888f2c03701a4216cb1a2c3890bf3de89b1 + :repository: https://github.com/DCLP/navigator.git + :revision: f6d9bb08e524f3291fcddbbf4e108e55151ae035 From 8e3b07b6e7345bd8ab81b743b4828f9517fd5e86 Mon Sep 17 00:00:00 2001 From: Ryan Baumann Date: Wed, 1 Dec 2021 10:09:14 -0500 Subject: [PATCH 4/4] Revert "Revert "Change back to EpiDoc XSLT and papyri navigator"" This reverts commit 762a00c486e1be11e03da9942669b498804a3f2a. --- config/externals.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/externals.yml b/config/externals.yml index a1cb9c0e7..eb3d8c3e5 100644 --- a/config/externals.yml +++ b/config/externals.yml @@ -5,10 +5,10 @@ lib/rxsugar: data/xslt/epidoc: :type: git - :repository: https://github.com/DCLP/epidoc-xslt.git - :revision: 97e957091d135ec6f8f169c13bdc8e279f26f00b + :repository: https://github.com/EpiDoc/Stylesheets.git + :revision: 06062b8c98b421a4c34421e66491b62b88715f9a data/xslt/pn/navigator: :type: git - :repository: https://github.com/DCLP/navigator.git - :revision: f6d9bb08e524f3291fcddbbf4e108e55151ae035 + :repository: https://github.com/papyri/navigator.git + :revision: 50a8d888f2c03701a4216cb1a2c3890bf3de89b1