From 9a8179a66460b5acdd0e4cb4c878f729db9a47e4 Mon Sep 17 00:00:00 2001 From: Ian Adam Naval Date: Tue, 31 Jul 2018 04:20:23 -0700 Subject: [PATCH 01/12] Set initial path to root of workspace --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 900587d..cca730f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,6 @@ workspace: base: /srv/jekyll - path: + path: / pipeline: build: -- 2.47.2 From 951ff2f379f218672996162b5e5a77cd29118a29 Mon Sep 17 00:00:00 2001 From: Ian Adam Naval Date: Tue, 31 Jul 2018 04:44:15 -0700 Subject: [PATCH 02/12] Add debug whoami --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index cca730f..5b062b0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,6 +6,7 @@ pipeline: build: image: jekyll/minimal:3.8.3 commands: + - whoami - cd ianonavy - jekyll build -- 2.47.2 From 8397abe2112f12d88972338a8d421935997d8585 Mon Sep 17 00:00:00 2001 From: Ian Adam Naval Date: Tue, 31 Jul 2018 04:59:25 -0700 Subject: [PATCH 03/12] Move site to top level --- .gitignore | 9 ++------- ianonavy/_config.yml => _config.yml | 0 {ianonavy/_drafts => _drafts}/code-snippets.md | 0 {ianonavy/_drafts => _drafts}/test-post.md | 0 {ianonavy/_includes => _includes}/footer.html | 0 {ianonavy/_includes => _includes}/head.html | 0 {ianonavy/_includes => _includes}/header.html | 0 {ianonavy/_layouts => _layouts}/default.html | 0 {ianonavy/_layouts => _layouts}/page.html | 0 {ianonavy/_layouts => _layouts}/post.html | 0 {ianonavy/_sass => _sass}/_base.scss | 0 {ianonavy/_sass => _sass}/_layout.scss | 0 {ianonavy/_sass => _sass}/_syntax-highlighting.scss | 0 ianonavy/about.md => about.md | 0 {ianonavy/css => css}/main.scss | 0 ianonavy/feed.xml => feed.xml | 0 {ianonavy/img => img}/feed-icon-14x14.png | Bin {ianonavy/img => img}/how2pizza.png | Bin {ianonavy/img => img}/mathhammer.png | Bin {ianonavy/img => img}/mirrors.png | Bin {ianonavy/img => img}/potatoipsum.png | Bin {ianonavy/img => img}/sms-fixer.png | Bin ianonavy/index.html => index.html | 0 ianonavy/pay.md => pay.md | 0 ianonavy/projects.html => projects.html | 0 25 files changed, 2 insertions(+), 7 deletions(-) rename ianonavy/_config.yml => _config.yml (100%) rename {ianonavy/_drafts => _drafts}/code-snippets.md (100%) rename {ianonavy/_drafts => _drafts}/test-post.md (100%) rename {ianonavy/_includes => _includes}/footer.html (100%) rename {ianonavy/_includes => _includes}/head.html (100%) rename {ianonavy/_includes => _includes}/header.html (100%) rename {ianonavy/_layouts => _layouts}/default.html (100%) rename {ianonavy/_layouts => _layouts}/page.html (100%) rename {ianonavy/_layouts => _layouts}/post.html (100%) rename {ianonavy/_sass => _sass}/_base.scss (100%) rename {ianonavy/_sass => _sass}/_layout.scss (100%) rename {ianonavy/_sass => _sass}/_syntax-highlighting.scss (100%) rename ianonavy/about.md => about.md (100%) rename {ianonavy/css => css}/main.scss (100%) rename ianonavy/feed.xml => feed.xml (100%) rename {ianonavy/img => img}/feed-icon-14x14.png (100%) rename {ianonavy/img => img}/how2pizza.png (100%) rename {ianonavy/img => img}/mathhammer.png (100%) rename {ianonavy/img => img}/mirrors.png (100%) rename {ianonavy/img => img}/potatoipsum.png (100%) rename {ianonavy/img => img}/sms-fixer.png (100%) rename ianonavy/index.html => index.html (100%) rename ianonavy/pay.md => pay.md (100%) rename ianonavy/projects.html => projects.html (100%) diff --git a/.gitignore b/.gitignore index 0ed48ce..badbc02 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,2 @@ -conf/passwords.txt -database.db -bin/ -include/ -lib/ -lib64 -*.pyc +_site +.sass-cache diff --git a/ianonavy/_config.yml b/_config.yml similarity index 100% rename from ianonavy/_config.yml rename to _config.yml diff --git a/ianonavy/_drafts/code-snippets.md b/_drafts/code-snippets.md similarity index 100% rename from ianonavy/_drafts/code-snippets.md rename to _drafts/code-snippets.md diff --git a/ianonavy/_drafts/test-post.md b/_drafts/test-post.md similarity index 100% rename from ianonavy/_drafts/test-post.md rename to _drafts/test-post.md diff --git a/ianonavy/_includes/footer.html b/_includes/footer.html similarity index 100% rename from ianonavy/_includes/footer.html rename to _includes/footer.html diff --git a/ianonavy/_includes/head.html b/_includes/head.html similarity index 100% rename from ianonavy/_includes/head.html rename to _includes/head.html diff --git a/ianonavy/_includes/header.html b/_includes/header.html similarity index 100% rename from ianonavy/_includes/header.html rename to _includes/header.html diff --git a/ianonavy/_layouts/default.html b/_layouts/default.html similarity index 100% rename from ianonavy/_layouts/default.html rename to _layouts/default.html diff --git a/ianonavy/_layouts/page.html b/_layouts/page.html similarity index 100% rename from ianonavy/_layouts/page.html rename to _layouts/page.html diff --git a/ianonavy/_layouts/post.html b/_layouts/post.html similarity index 100% rename from ianonavy/_layouts/post.html rename to _layouts/post.html diff --git a/ianonavy/_sass/_base.scss b/_sass/_base.scss similarity index 100% rename from ianonavy/_sass/_base.scss rename to _sass/_base.scss diff --git a/ianonavy/_sass/_layout.scss b/_sass/_layout.scss similarity index 100% rename from ianonavy/_sass/_layout.scss rename to _sass/_layout.scss diff --git a/ianonavy/_sass/_syntax-highlighting.scss b/_sass/_syntax-highlighting.scss similarity index 100% rename from ianonavy/_sass/_syntax-highlighting.scss rename to _sass/_syntax-highlighting.scss diff --git a/ianonavy/about.md b/about.md similarity index 100% rename from ianonavy/about.md rename to about.md diff --git a/ianonavy/css/main.scss b/css/main.scss similarity index 100% rename from ianonavy/css/main.scss rename to css/main.scss diff --git a/ianonavy/feed.xml b/feed.xml similarity index 100% rename from ianonavy/feed.xml rename to feed.xml diff --git a/ianonavy/img/feed-icon-14x14.png b/img/feed-icon-14x14.png similarity index 100% rename from ianonavy/img/feed-icon-14x14.png rename to img/feed-icon-14x14.png diff --git a/ianonavy/img/how2pizza.png b/img/how2pizza.png similarity index 100% rename from ianonavy/img/how2pizza.png rename to img/how2pizza.png diff --git a/ianonavy/img/mathhammer.png b/img/mathhammer.png similarity index 100% rename from ianonavy/img/mathhammer.png rename to img/mathhammer.png diff --git a/ianonavy/img/mirrors.png b/img/mirrors.png similarity index 100% rename from ianonavy/img/mirrors.png rename to img/mirrors.png diff --git a/ianonavy/img/potatoipsum.png b/img/potatoipsum.png similarity index 100% rename from ianonavy/img/potatoipsum.png rename to img/potatoipsum.png diff --git a/ianonavy/img/sms-fixer.png b/img/sms-fixer.png similarity index 100% rename from ianonavy/img/sms-fixer.png rename to img/sms-fixer.png diff --git a/ianonavy/index.html b/index.html similarity index 100% rename from ianonavy/index.html rename to index.html diff --git a/ianonavy/pay.md b/pay.md similarity index 100% rename from ianonavy/pay.md rename to pay.md diff --git a/ianonavy/projects.html b/projects.html similarity index 100% rename from ianonavy/projects.html rename to projects.html -- 2.47.2 From 1b45269e493bea7de3366b1e2211c65c21de703e Mon Sep 17 00:00:00 2001 From: Ian Adam Naval Date: Tue, 31 Jul 2018 05:01:37 -0700 Subject: [PATCH 04/12] Add Gemfiles --- Gemfile | 5 ++++ Gemfile.lock | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 Gemfile create mode 100644 Gemfile.lock diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..5a68c18 --- /dev/null +++ b/Gemfile @@ -0,0 +1,5 @@ +source "https://rubygems.org" + +gem "jekyll" +gem "jekyll-whiteglass" +gem "jekyll-tidy" diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..3250e86 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,81 @@ +GEM + remote: https://rubygems.org/ + specs: + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + colorator (1.1.0) + concurrent-ruby (1.0.5) + em-websocket (0.5.1) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0.6.0) + eventmachine (1.2.7) + ffi (1.9.25) + forwardable-extended (2.6.0) + htmlbeautifier (1.3.1) + htmlcompressor (0.4.0) + http_parser.rb (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + jekyll (3.8.3) + addressable (~> 2.4) + colorator (~> 1.0) + em-websocket (~> 0.5) + i18n (~> 0.7) + jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 2.0) + kramdown (~> 1.14) + liquid (~> 4.0) + mercenary (~> 0.3.3) + pathutil (~> 0.9) + rouge (>= 1.7, < 4) + safe_yaml (~> 1.0) + jekyll-archives (2.1.1) + jekyll (>= 2.4) + jekyll-paginate (1.1.0) + jekyll-sass-converter (1.5.2) + sass (~> 3.4) + jekyll-sitemap (1.2.0) + jekyll (~> 3.3) + jekyll-tidy (0.2.2) + htmlbeautifier + htmlcompressor + jekyll + jekyll-watch (2.0.0) + listen (~> 3.0) + jekyll-whiteglass (1.7.0) + jekyll (~> 3.3) + jekyll-archives (~> 2.1) + jekyll-paginate (~> 1.1) + jekyll-sitemap (~> 1.0) + kramdown (1.17.0) + liquid (4.0.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + mercenary (0.3.6) + pathutil (0.16.1) + forwardable-extended (~> 2.6) + public_suffix (3.0.2) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + rouge (3.1.1) + ruby_dep (1.5.0) + safe_yaml (1.0.4) + sass (3.5.7) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + +PLATFORMS + ruby + +DEPENDENCIES + jekyll + jekyll-tidy + jekyll-whiteglass + +BUNDLED WITH + 1.16.1 -- 2.47.2 From 8c810da6123b5015a002af4bea99737881973b90 Mon Sep 17 00:00:00 2001 From: Ian Adam Naval Date: Tue, 31 Jul 2018 05:02:40 -0700 Subject: [PATCH 05/12] Change to plain Ruby image --- .drone.yml | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5b062b0..7225804 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,12 +1,22 @@ -workspace: - base: /srv/jekyll - path: / - pipeline: + restore-cache: + image: drillster/drone-volume-cache + restore: true + mount: + - /drone/.bundle + volumes: + - /tmp/bundle-cache:/cache build: - image: jekyll/minimal:3.8.3 + image: ruby:2.5.1-alpine3.7 + environment: + - BUNDLE_PATH=/drone/.bundle commands: - - whoami - - cd ianonavy - - jekyll build - + - bundle install + - bundle exec jekyll build + rebuild-cache: + image: drillster/drone-volume-cache + rebuild: true + mount: + - /drone/.bundle + volumes: + - /tmp/bundle-cache:/cache -- 2.47.2 From ba72a7940c961cc573d376f62523220f95128b74 Mon Sep 17 00:00:00 2001 From: Ian Adam Naval Date: Tue, 31 Jul 2018 05:11:39 -0700 Subject: [PATCH 06/12] Simplify as much as possible --- .drone.yml | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/.drone.yml b/.drone.yml index 7225804..8cfe8da 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,22 +1,5 @@ pipeline: - restore-cache: - image: drillster/drone-volume-cache - restore: true - mount: - - /drone/.bundle - volumes: - - /tmp/bundle-cache:/cache build: - image: ruby:2.5.1-alpine3.7 - environment: - - BUNDLE_PATH=/drone/.bundle + image: jekyll/jekyll:latest commands: - - bundle install - - bundle exec jekyll build - rebuild-cache: - image: drillster/drone-volume-cache - rebuild: true - mount: - - /drone/.bundle - volumes: - - /tmp/bundle-cache:/cache + - jekyll build -- 2.47.2 From 6374452b9d43a35d8d3b8351b0625bd36169fbd1 Mon Sep 17 00:00:00 2001 From: Ian Adam Naval Date: Tue, 31 Jul 2018 05:15:34 -0700 Subject: [PATCH 07/12] Add chown to root --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 8cfe8da..a6ba4d2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,4 +2,5 @@ pipeline: build: image: jekyll/jekyll:latest commands: + - chown -R root. . - jekyll build -- 2.47.2 From 6590455f8f07737266078fad05e9c6c94a6380ca Mon Sep 17 00:00:00 2001 From: Ian Adam Naval Date: Tue, 31 Jul 2018 05:15:52 -0700 Subject: [PATCH 08/12] Remove slow Gemfiles --- Gemfile | 5 ---- Gemfile.lock | 81 ---------------------------------------------------- 2 files changed, 86 deletions(-) delete mode 100644 Gemfile delete mode 100644 Gemfile.lock diff --git a/Gemfile b/Gemfile deleted file mode 100644 index 5a68c18..0000000 --- a/Gemfile +++ /dev/null @@ -1,5 +0,0 @@ -source "https://rubygems.org" - -gem "jekyll" -gem "jekyll-whiteglass" -gem "jekyll-tidy" diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 3250e86..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,81 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) - colorator (1.1.0) - concurrent-ruby (1.0.5) - em-websocket (0.5.1) - eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) - eventmachine (1.2.7) - ffi (1.9.25) - forwardable-extended (2.6.0) - htmlbeautifier (1.3.1) - htmlcompressor (0.4.0) - http_parser.rb (0.6.0) - i18n (0.9.5) - concurrent-ruby (~> 1.0) - jekyll (3.8.3) - addressable (~> 2.4) - colorator (~> 1.0) - em-websocket (~> 0.5) - i18n (~> 0.7) - jekyll-sass-converter (~> 1.0) - jekyll-watch (~> 2.0) - kramdown (~> 1.14) - liquid (~> 4.0) - mercenary (~> 0.3.3) - pathutil (~> 0.9) - rouge (>= 1.7, < 4) - safe_yaml (~> 1.0) - jekyll-archives (2.1.1) - jekyll (>= 2.4) - jekyll-paginate (1.1.0) - jekyll-sass-converter (1.5.2) - sass (~> 3.4) - jekyll-sitemap (1.2.0) - jekyll (~> 3.3) - jekyll-tidy (0.2.2) - htmlbeautifier - htmlcompressor - jekyll - jekyll-watch (2.0.0) - listen (~> 3.0) - jekyll-whiteglass (1.7.0) - jekyll (~> 3.3) - jekyll-archives (~> 2.1) - jekyll-paginate (~> 1.1) - jekyll-sitemap (~> 1.0) - kramdown (1.17.0) - liquid (4.0.0) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) - mercenary (0.3.6) - pathutil (0.16.1) - forwardable-extended (~> 2.6) - public_suffix (3.0.2) - rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - rouge (3.1.1) - ruby_dep (1.5.0) - safe_yaml (1.0.4) - sass (3.5.7) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - -PLATFORMS - ruby - -DEPENDENCIES - jekyll - jekyll-tidy - jekyll-whiteglass - -BUNDLED WITH - 1.16.1 -- 2.47.2 From 4b801ca6068476edcd173ec7939c16c71945ec3e Mon Sep 17 00:00:00 2001 From: Ian Adam Naval Date: Tue, 31 Jul 2018 05:17:30 -0700 Subject: [PATCH 09/12] Add debug ls --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index a6ba4d2..774fa81 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,4 +3,5 @@ pipeline: image: jekyll/jekyll:latest commands: - chown -R root. . + - ls -la . - jekyll build -- 2.47.2 From fd91d8937d44509816d246012d0afb5dea82405d Mon Sep 17 00:00:00 2001 From: Ian Adam Naval Date: Tue, 31 Jul 2018 13:25:03 -0700 Subject: [PATCH 10/12] Change Jekyll to run as root --- .drone.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 774fa81..17eb905 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,7 +1,8 @@ pipeline: build: image: jekyll/jekyll:latest + environment: + JEKYLL_UID: 0 + JEKYLL_GID: 0 commands: - - chown -R root. . - - ls -la . - jekyll build -- 2.47.2 From 797262138b0625cb471623d00be8368980666a49 Mon Sep 17 00:00:00 2001 From: Ian Adam Naval Date: Tue, 31 Jul 2018 13:25:51 -0700 Subject: [PATCH 11/12] Fix environment variable not a string --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 17eb905..35b0a2c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,7 +2,7 @@ pipeline: build: image: jekyll/jekyll:latest environment: - JEKYLL_UID: 0 - JEKYLL_GID: 0 + JEKYLL_UID: "0" + JEKYLL_GID: "0" commands: - jekyll build -- 2.47.2 From 75a1dbfe138b9a42b14411b9f1cc24ad87edb10e Mon Sep 17 00:00:00 2001 From: Ian Adam Naval Date: Tue, 31 Jul 2018 13:37:21 -0700 Subject: [PATCH 12/12] Try making the _site --- .drone.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 35b0a2c..4ed0634 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,8 +1,6 @@ pipeline: build: image: jekyll/jekyll:latest - environment: - JEKYLL_UID: "0" - JEKYLL_GID: "0" commands: + - mkdir _site - jekyll build -- 2.47.2