diff --git a/Dockerfile b/Dockerfile index c22494d..5bcc9f1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,26 +1,20 @@ FROM docker.io/jekyll/builder as builder - RUN gem install bundler:2.2.3 - RUN mkdir /site; \ chown -R jekyll:jekyll /site WORKDIR /site - COPY Gemfile Gemfile.lock /site/ RUN bundle install - COPY . /site/ - RUN bundle exec rake build:production FROM docker.io/httpd:2.4 - RUN apt update && apt install -y sssd - RUN rm -rf /usr/local/apache2/htdocs/* COPY --from=builder /site/_site/ /usr/local/apache2/htdocs/ COPY httpd-suffix.conf httpd-suffix.conf RUN cat httpd-suffix.conf >> /usr/local/apache2/conf/httpd.conf COPY entrypoint.sh /entrypoint.sh +EXPOSE 80 ENTRYPOINT ["/usr/bin/bash", "/entrypoint.sh"] CMD ["httpd-foreground"] diff --git a/README.md b/README.md index 77f8993..79bd0c4 100644 --- a/README.md +++ b/README.md @@ -8,23 +8,16 @@ This site is written using [Jekyll](https://jekyllrb.com/), a static site genera ## Local Development -#### Prerequisites: -1. [Ruby](https://www.ruby-lang.org/en/documentation/installation/) -2. [Bundler](https://bundler.io/) (`gem install bundler`) +Build the container: `docker build -t cshpublicsite .` +Run the container: `docker run -p 4000:80 cshpublicsite` +You will be able to access the site at http://localhost:4000. -#### Instructions -1. `bundle install` -2. Add necessary environment variables (they MUST be defined!!!): - * `export CSHPUBSITE_ASSETS_URL="https://assets.csh.rit.edu/pubsite"` - * `export CSHPUBSITE_S3_URL="https://s3.csh.rit.edu"` -3. `bundle exec jekyll serve` - -The site should now serve locally at `localhost:4000`, and auto-build when you change/create files in the repo! +You can either edit files in the container, or rebuild the container when you want to test changes. ## Contributing 1. [Fork](https://help.github.com/en/articles/fork-a-repo) this repository - - Optionally create a new [git branch](https://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell) if your change is more than a small tweak (`git checkout -b BRANCH-NAME-HERE`) + - Create a new [git branch](https://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell) if your change is more than a small tweak (`git checkout -b BRANCH-NAME-HERE`) 3. Make your changes locally, commit, and push to your fork 4. Create a [Pull Request](https://help.github.com/en/articles/about-pull-requests) on this repo for our Webmasters to review diff --git a/about/eboard.html b/about/eboard.html index 69d4c62..cc07d19 100644 --- a/about/eboard.html +++ b/about/eboard.html @@ -82,7 +82,7 @@
The primary responsibility of the History director is keeping the line of communication between CSH and our alumni open.