From 97857a8c2781f7e5311fd04e84390d60788fcfd1 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Mon, 30 Mar 2020 17:13:41 +0200 Subject: [PATCH] Enable docker builds for the site --- .gitlab-ci.yml | 19 ------------------- CHANGELOG.md | 11 +++++++++-- CONTRIBUTING.md | 8 ++++---- Dockerfile | 13 +++++++++++++ README.md | 26 ++++++++------------------ _config.yml | 3 ++- autonomic.gemspec | 2 +- 7 files changed, 37 insertions(+), 45 deletions(-) delete mode 100644 .gitlab-ci.yml create mode 100644 Dockerfile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index c4f82af..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,19 +0,0 @@ -stages: - - deploy - -variables: - GIT_DEPTH: 1 - - -pages: - image: jekyll/jekyll:4 - stage: deploy - script: - - jekyll build -d public - - apk add gzip --update-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ --allow-untrusted - - gzip -v -k -6 $(find public -name '*.js' -o -name '*.html' -o -name '*.css') - artifacts: - paths: - - public - only: - - master diff --git a/CHANGELOG.md b/CHANGELOG.md index e9be7a9..fa21913 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,12 +3,17 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog] and this project adheres to [Semantic Versioning]. -[Keep a Changelog]: http://keepachangelog.com/en/1.0.0/ -[Semantic Versioning]: http://semver.org/spec/v2.0.0.html +[keep a changelog]: http://keepachangelog.com/en/1.0.0/ +[semantic versioning]: http://semver.org/spec/v2.0.0.html + +## [2.0.0] - 2020-03-30 + +- Moved website deployment to [git.autonomic.zone](https://git.autonomic.zone). ## [1.0.2] - 2017-11-05 ## Added + - [#18]: Add shared account email. [#18]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/merge_requests/18 @@ -16,9 +21,11 @@ is based on [Keep a Changelog] and this project adheres to [Semantic Versioning] ## [1.0.1] - 2017-10-14 ## Added + - [#17]: Added automated Gitlab CI production builds. [#17]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/merge_requests/17 ## [1.0.0] - 2017-10-04 + - Initial Release diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b6d3879..e2eb1a4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Contributing -### Not that these instructions may be out of date. If you find any quirks that aren't described in this file, please make patches. +> Not that these instructions may be out of date. If you find any quirks that aren't described in this file, please make patches. # What Is Jekyll @@ -36,7 +36,7 @@ $ rvm gemset use autonomic Then you can install your Ruby dependencies with: -``` bash +```bash $ gem install jekyll bundler $ bundle install ``` @@ -45,7 +45,7 @@ $ bundle install And serve the website locally with: -``` bash +```bash $ make devserver ``` @@ -57,7 +57,7 @@ Edit content in the `.md` files under `src` and `src/_posts`. When you're hacking later on (or in a new shell), you'll need to run: -``` bash +```bash $ rvm use 2.6.5 $ rvm gemset use autonomic ``` diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..17880cc --- /dev/null +++ b/Dockerfile @@ -0,0 +1,13 @@ +FROM decentral1se/jekyll:4 + +EXPOSE 4000 + +WORKDIR /usr/src/app + +COPY . ${WORKDIR} + +RUN bundle config --global frozen 1 + +RUN bundle install + +CMD ["jekyll", "serve", "--trace"] diff --git a/README.md b/README.md index 18dc787..309c46e 100644 --- a/README.md +++ b/README.md @@ -1,29 +1,19 @@ -[![pipeline status](https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/badges/master/pipeline.svg)](https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/commits/master) - # autonomic.zone +> https://autonomic.zone + A [Jekyll] based site for the Autonomic Cooperative. The site is based on the [spectral-jekyll-theme] template. - -master is served up to [autonomic.zone] and [autonomic-cooperative.gitlab.io]. - -[Jekyll]: https://jekyllrb.com/ +[jekyll]: https://jekyllrb.com/ [spectral-jekyll-theme]: https://github.com/andrewbanchich/spectral-jekyll-theme [autonomic.zone]: https://autonomic.zone/ [autonomic-cooperative.gitlab.io]: http://autonomic-cooperative.gitlab.io/ -# Make a change - -Work on features in branches. If you commit to master, open a merge request from your branch unless it is a tiny change. Our [pages] CI stage will push any changes on master branch to [autonomic.zone]. - -[deploy]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/blob/d16aec42bd2ddd7449f55d9f06b03499cc660b22/.gitlab-ci.yml#L17 - -Watch the [CI/CD pipeline] to see that it builds successfully. - -[CI/CD pipeline]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/pipelines - +# Deploy # Contribute -Please see [CONTRIBUTING.md] for the juicy details. It may need to be updated, so please submit patches if you discover some quirk! +Please see [CONTRIBUTING.md] for the juicy details. -[CONTRIBUTING.md]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/blob/master/CONTRIBUTING.md +It may need to be updated, so please submit patches if you discover some quirk! + +[contributing.md]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/blob/master/CONTRIBUTING.md diff --git a/_config.yml b/_config.yml index a30728a..a65f223 100644 --- a/_config.yml +++ b/_config.yml @@ -1,3 +1,4 @@ +--- title: Autonomic Co-operative email: helo@autonomic.zone description: Sustainability, Transparency, Privacy @@ -6,7 +7,7 @@ url: "" source: src destination: dist sass: - sass_dir: ./assets/styles + sass_dir: ./assets/styles featured-image-source: 500px_url: github_url: diff --git a/autonomic.gemspec b/autonomic.gemspec index d4ebb76..612b492 100644 --- a/autonomic.gemspec +++ b/autonomic.gemspec @@ -11,5 +11,5 @@ Gem::Specification.new do |spec| spec.files = `git ls-files -z`.split("\x0").select { |f| f.match(%r{^(assets|_layouts|_includes|_sass|LICENSE|README)}i) } spec.add_development_dependency "jekyll", ">= 4" - spec.add_development_dependency "bundler", ">= 1.12" + spec.add_development_dependency "bundler", ">= 2.1.4" end