Commit 49f66c3a authored by Anna Wilson's avatar Anna Wilson

Revert "Merge branch 'sal-remove-rmagick' into 'staging'"

This reverts merge request !17
parent bfee4047
image: jekyll/builder
image: ruby:2.3
variables:
JEKYLL_ENV: production
......@@ -12,10 +12,11 @@ cache:
before_script:
- bundle install --path vendor
- wget -O _data/events/eventlist.csv https://docs.google.com/spreadsheets/d/$EVENTSHEET/gviz/tq?tqx=out:csv\&sheet=Events
- wget -O _data/events/bidlist.csv https://docs.google.com/spreadsheets/d/$EVENTSHEET/gviz/tq?tqx=out:csv\&sheet=Bidlist
- wget -O _data/groups/grouplist.csv https://docs.google.com/spreadsheets/d/$GROUPSHEET/gviz/tq?tqx=out:csv\&sheet=groups
- wget -O _data/groups/officerlist.csv https://docs.google.com/spreadsheets/d/$GROUPSHEET/gviz/tq?tqx=out:csv\&sheet=officers
- curl -o _data/events/eventlist.csv https://docs.google.com/spreadsheets/d/$EVENTSHEET/gviz/tq?tqx=out:csv\&sheet=Events
- curl -o _data/events/bidlist.csv https://docs.google.com/spreadsheets/d/$EVENTSHEET/gviz/tq?tqx=out:csv\&sheet=Bidlist
- curl -o _data/groups/grouplist.csv https://docs.google.com/spreadsheets/d/$GROUPSHEET/gviz/tq?tqx=out:csv\&sheet=groups
- curl -o _data/groups/officerlist.csv https://docs.google.com/spreadsheets/d/$GROUPSHEET/gviz/tq?tqx=out:csv\&sheet=officers
- 'apt-get update && apt-get install -y locales && locale-gen en_US.UTF-8 && localedef -i en_US -f UTF-8 en_US.UTF-8'
pages:
environment: staging
......@@ -31,11 +32,34 @@ pages:
deploy:
environment: production
script:
##
## Install ssh-agent if not already installed, it is required by Docker.
## (change apt-get to yum if you use an RPM-based image)
##
- apt-get install openssh-client rsync -y
##
## Run ssh-agent (inside the build environment)
##
- eval $(ssh-agent -s)
##
##
## Create the SSH directory and give it the right permissions
##
- mkdir -p ~/.ssh
- chmod 700 ~/.ssh
##
## Optionally, if you will be using any Git commands, set the user name and
## and email.
##
#- git config --global user.email "user@example.com"
#- git config --global user.name "User name"
- echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
- chmod 644 ~/.ssh/known_hosts
## Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store
## We're using tr to fix line endings which makes ed25519 keys work
## without extra base64 encoding.
## https://gitlab.com/gitlab-examples/ssh-private-key/issues/1#note_48526556
##
- echo "${SSH_PRIVATE_KEY}" | tr -d '\r' | ssh-add - > /dev/null
- bundle exec jekyll build -d public/j
- rsync -rvzc -e 'ssh -p 2222' public/j $WEBHOST:public_html/
......
FROM jekyll/builder
FROM ruby:2.3
VOLUME ["/build"]
WORKDIR /build
EXPOSE 4000
RUN apt-get update && \
apt-get install -y locales && \
locale-gen en_US.UTF-8 && \
localedef -i en_US -f UTF-8 en_US.UTF-8
ENV LC_ALL="C.UTF-8"
ENV LANG="en_US.UTF-8"
ENV LANGUAGE="en_US.UTF-8"
......
......@@ -22,6 +22,7 @@ group :jekyll_plugins do
gem "jekyll-feed", "~> 0.6"
gem "jekyll-paginate-v2", "2.0.0"
gem "jekyll-redirect-from"
gem "jekyll-responsive-image"
gem "jekyll-sitemap"
end
......
......@@ -32,6 +32,7 @@ plugins:
- jekyll-feed
- jekyll-paginate-v2
- jekyll-redirect-from
- jekyll-responsive-image
- jekyll-sitemap
permalink: pretty
......
......@@ -17,7 +17,7 @@
{% if site.gitlab.repository_url %}
<ul>
<li><a href="{{site.gitlab.repository_url}}/blob/staging/{{ page.path }}"><i class="fab fa-fw fa-gitlab" aria-hidden="true"></i> Edit this page on GitLab</a></li>
<li><a href="{{site.gitlab.repository_url}}/blob/master/"><i class="fab fa-fw fa-gitlab" aria-hidden="true"></i> Edit this site on GitLab</a></li>
</ul>
{% endif %}
</div>
......
......@@ -37,7 +37,10 @@
{% unless p.portrait == "" %}
<br><br><br><br><br>
<span class="image">
<img src="{{ site.baseurl }}/{{p.portrait}}" alt="{{p.scaname}}">
{% responsive_image_block %}
path: {{ p.portrait }}
alt: {{ p.scaname }}
{% endresponsive_image_block %}
</span>
{% endunless %}
{% endif %}
......
......@@ -6,4 +6,6 @@ category: artsci
published: true
featureimg: images/foo/test.jpg
---
baz and woo
\ No newline at end of file
baz and woo
<span class="image">{% responsive_image path: images/pic04.jpg alt: "alt text goes here" %}</span>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment