From 899d03e394d9ee39a5d4f4f0c15af350b00892d5 Mon Sep 17 00:00:00 2001 From: Yami Date: Fri, 8 Jun 2018 14:33:56 +0000 Subject: [PATCH 1/9] add dockerfile --- Dockerfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..5922e14 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,15 @@ +FROM ruby:2.5-slim as builder +RUN apt-get update \ + && apt-get install -y \ + build-essential \ + && gem install --no-ri --no-rdoc image_optim image_optim_pack jekyll \ + && mkdir -p /var/build + +COPY ./ /var/build +WORKDIR /var/build +RUN image_optim assets/images/* && jekyll build + + +FROM kyma/docker-nginx +COPY --from=builder /var/build/_site /var/www +CMD 'nginx' \ No newline at end of file From 7f22b881b547674af4918eab8dbc722d3d116915 Mon Sep 17 00:00:00 2001 From: Yami Date: Fri, 8 Jun 2018 14:36:54 +0000 Subject: [PATCH 2/9] fix: bad image path --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5922e14..e509ca8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ RUN apt-get update \ COPY ./ /var/build WORKDIR /var/build -RUN image_optim assets/images/* && jekyll build +RUN image_optim assets/* && jekyll build FROM kyma/docker-nginx From 069c017e27a9b1b2150f315bb17234e44d213652 Mon Sep 17 00:00:00 2001 From: Yami Date: Fri, 8 Jun 2018 14:38:59 +0000 Subject: [PATCH 3/9] remove rake --- Gemfile | 1 - rakefile => rakefile.old | 0 2 files changed, 1 deletion(-) rename rakefile => rakefile.old (100%) diff --git a/Gemfile b/Gemfile index b17d0eb..5874cae 100644 --- a/Gemfile +++ b/Gemfile @@ -2,5 +2,4 @@ source 'https://rubygems.org' gem 'jekyll' gem 'image_optim' gem 'image_optim_pack' -gem 'rake' gem 'html-proofer', '~> 3.3.0' \ No newline at end of file diff --git a/rakefile b/rakefile.old similarity index 100% rename from rakefile rename to rakefile.old From 694b1858c605a98224747a9698c9aed5e39297da Mon Sep 17 00:00:00 2001 From: Yami Date: Fri, 8 Jun 2018 14:40:40 +0000 Subject: [PATCH 4/9] fix: I think it's just gem install --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e509ca8..9a80cce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ruby:2.5-slim as builder RUN apt-get update \ && apt-get install -y \ build-essential \ - && gem install --no-ri --no-rdoc image_optim image_optim_pack jekyll \ + && gem install \ && mkdir -p /var/build COPY ./ /var/build From e3cbddf30ed317722ab62d9780e22a97425eff50 Mon Sep 17 00:00:00 2001 From: Yami Date: Fri, 8 Jun 2018 14:41:54 +0000 Subject: [PATCH 5/9] fix: nope, bundler install --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9a80cce..2385c35 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ruby:2.5-slim as builder RUN apt-get update \ && apt-get install -y \ build-essential \ - && gem install \ + && bundle install \ && mkdir -p /var/build COPY ./ /var/build From a087473e3c27bb7e5dd3991de8efd15342cf69eb Mon Sep 17 00:00:00 2001 From: Yami Date: Fri, 8 Jun 2018 14:43:51 +0000 Subject: [PATCH 6/9] fix: run bundle install after copying the gemfile in --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2385c35..7499545 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,14 @@ FROM ruby:2.5-slim as builder RUN apt-get update \ && apt-get install -y \ build-essential \ - && bundle install \ && mkdir -p /var/build COPY ./ /var/build WORKDIR /var/build -RUN image_optim assets/* && jekyll build + +RUN bundle install \ + && image_optim assets/* \ + && jekyll build FROM kyma/docker-nginx From 911ea73091486ac2d8150e7501fed1b71989fb72 Mon Sep 17 00:00:00 2001 From: Yami Date: Fri, 8 Jun 2018 14:45:54 +0000 Subject: [PATCH 7/9] put rake back --- Dockerfile | 3 +-- rakefile.old => rakefile | 0 2 files changed, 1 insertion(+), 2 deletions(-) rename rakefile.old => rakefile (100%) diff --git a/Dockerfile b/Dockerfile index 7499545..1b8245b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,8 +8,7 @@ COPY ./ /var/build WORKDIR /var/build RUN bundle install \ - && image_optim assets/* \ - && jekyll build + && rake build FROM kyma/docker-nginx diff --git a/rakefile.old b/rakefile similarity index 100% rename from rakefile.old rename to rakefile From 61c1e76ae8dbecb79588a485eb0ef1ff039d4d70 Mon Sep 17 00:00:00 2001 From: Yami Date: Fri, 8 Jun 2018 14:50:01 +0000 Subject: [PATCH 8/9] let's see if this is legal syntax --- rakefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rakefile b/rakefile index 699d83c..8374078 100644 --- a/rakefile +++ b/rakefile @@ -1,5 +1,3 @@ -require 'html-proofer' - task :build do puts "building site" sh "bundle exec jekyll build" @@ -8,6 +6,7 @@ task :build do end task :test do + require 'html-proofer' opts = { :check_html => false, :internal_domains => ['www.sockdrawer.io']} HTMLProofer.check_directory("./_site", opts).run end From 892d5290aa9f578ae6851aba922c14d5afbcf91d Mon Sep 17 00:00:00 2001 From: Yami Date: Fri, 8 Jun 2018 14:52:39 +0000 Subject: [PATCH 9/9] uh, we need to do images first don't we? --- rakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rakefile b/rakefile index 8374078..ead129e 100644 --- a/rakefile +++ b/rakefile @@ -1,8 +1,8 @@ task :build do - puts "building site" - sh "bundle exec jekyll build" puts "Compressing images... Grab a coffee" sh "image_optim images/* --no-pngout --no-svgo" + puts "building site" + sh "bundle exec jekyll build" end task :test do