Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upstream XSLT #308

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Upstream XSLT #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e11ab3
Update Dockerfile and anonymous git clone behavior
ryanfb Nov 2, 2021
3d8e606
Change back to EpiDoc XSLT and papyri navigator
hcayless Nov 29, 2021
762a00c
Revert "Change back to EpiDoc XSLT and papyri navigator"
ryanfb Dec 1, 2021
8e3b07b
Revert "Revert "Change back to EpiDoc XSLT and papyri navigator""
ryanfb Dec 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:xenial
FROM ubuntu:focal
MAINTAINER Ryan Baumann <[email protected]>

# Install the Ubuntu packages.
Expand All @@ -8,8 +8,8 @@ MAINTAINER Ryan Baumann <[email protected]>
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
Expand All @@ -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
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions config/externals.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
:revision: 97e957091d135ec6f8f169c13bdc8e279f26f00b
:repository: https://github.com/EpiDoc/Stylesheets.git
:revision: 06062b8c98b421a4c34421e66491b62b88715f9a

data/xslt/pn/navigator:
:type: git
:repository: git://github.com/DCLP/navigator.git
:revision: f6d9bb08e524f3291fcddbbf4e108e55151ae035
:repository: https://github.com/papyri/navigator.git
:revision: 50a8d888f2c03701a4216cb1a2c3890bf3de89b1
4 changes: 2 additions & 2 deletions lib/tasks/git.rake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down