From 5ea19d7578bba08b235c908501483394500d8e0a Mon Sep 17 00:00:00 2001 From: Suwako Moriya Date: Sat, 17 Jun 2023 18:31:01 +0300 Subject: [PATCH] Fix Pipeline --- .gitignore | 2 ++ Dockerfile | 10 +++++- Gemfile | 2 +- Gemfile.lock | 84 ----------------------------------------------- Jenkinsfile | 4 +-- assets/style.scss | 2 +- 6 files changed, 15 insertions(+), 89 deletions(-) delete mode 100644 Gemfile.lock diff --git a/.gitignore b/.gitignore index 7e255a3..4fc0ed1 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,9 @@ _site/ .sass-cache/ .jekyll-cache/ .jekyll-metadata + # Ignore folders generated by Bundler .bundle/ vendor/ +.Gemfile.lock diff --git a/Dockerfile b/Dockerfile index 70ebe57..39c9ce3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,15 @@ -FROM jekyll/jekyll +FROM alpine + RUN apk add sudo RUN echo "%wheel ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers + +RUN apk add shadow +RUN adduser jekyll -D -u 1000 RUN gpasswd -a jekyll wheel + RUN apk add openssh RUN apk add rsync + +RUN apk add jekyll + CMD ["/bin/bash"] diff --git a/Gemfile b/Gemfile index ff2c342..40105b5 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ gem "minima", "~> 2.5" # gem "github-pages", group: :jekyll_plugins # If you have any plugins, put them here! group :jekyll_plugins do - gem "jekyll-feed", "~> 0.12" +# gem "jekyll-feed", "~> 0.12" end # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 9ec8e92..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,84 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - addressable (2.8.4) - public_suffix (>= 2.0.2, < 6.0) - colorator (1.1.0) - concurrent-ruby (1.2.2) - em-websocket (0.5.3) - eventmachine (>= 0.12.9) - http_parser.rb (~> 0) - eventmachine (1.2.7) - ffi (1.15.5) - forwardable-extended (2.6.0) - google-protobuf (3.23.3-x86_64-linux) - http_parser.rb (0.8.0) - i18n (1.14.1) - concurrent-ruby (~> 1.0) - jekyll (4.3.2) - addressable (~> 2.4) - colorator (~> 1.0) - em-websocket (~> 0.5) - i18n (~> 1.0) - jekyll-sass-converter (>= 2.0, < 4.0) - jekyll-watch (~> 2.0) - kramdown (~> 2.3, >= 2.3.1) - kramdown-parser-gfm (~> 1.0) - liquid (~> 4.0) - mercenary (>= 0.3.6, < 0.5) - pathutil (~> 0.9) - rouge (>= 3.0, < 5.0) - safe_yaml (~> 1.0) - terminal-table (>= 1.8, < 4.0) - webrick (~> 1.7) - jekyll-feed (0.17.0) - jekyll (>= 3.7, < 5.0) - jekyll-sass-converter (3.0.0) - sass-embedded (~> 1.54) - jekyll-seo-tag (2.8.0) - jekyll (>= 3.8, < 5.0) - jekyll-watch (2.2.1) - listen (~> 3.0) - kramdown (2.4.0) - rexml - kramdown-parser-gfm (1.1.0) - kramdown (~> 2.0) - liquid (4.0.4) - listen (3.8.0) - rb-fsevent (~> 0.10, >= 0.10.3) - rb-inotify (~> 0.9, >= 0.9.10) - mercenary (0.4.0) - minima (2.5.1) - jekyll (>= 3.5, < 5.0) - jekyll-feed (~> 0.9) - jekyll-seo-tag (~> 2.1) - pathutil (0.16.2) - forwardable-extended (~> 2.6) - public_suffix (5.0.1) - rb-fsevent (0.11.2) - rb-inotify (0.10.1) - ffi (~> 1.0) - rexml (3.2.5) - rouge (4.1.2) - safe_yaml (1.0.5) - sass-embedded (1.63.4-x86_64-linux-gnu) - google-protobuf (~> 3.23) - terminal-table (3.0.2) - unicode-display_width (>= 1.1.1, < 3) - unicode-display_width (2.4.2) - webrick (1.8.1) - -PLATFORMS - x86_64-linux - -DEPENDENCIES - http_parser.rb (~> 0.6.0) - jekyll (~> 4.3.2) - jekyll-feed (~> 0.12) - minima (~> 2.5) - tzinfo (>= 1, < 3) - tzinfo-data - wdm (~> 0.1.1) - -BUNDLED WITH - 2.3.26 diff --git a/Jenkinsfile b/Jenkinsfile index d4bde58..c0ccad6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,8 +5,8 @@ pipeline { } } environment { - JEKYLL_UID = '1001' - JEKYLL_GID = '1001' + JEKYLL_UID = '1000' + JEKYLL_GID = '1000' JEKYLL_ENV = 'production' DEPLOY_HOST = 'webroot@colabois.fr' PROJECT_NAME = 'cuisine.colabois.fr' diff --git a/assets/style.scss b/assets/style.scss index 1f10224..9f41894 100644 --- a/assets/style.scss +++ b/assets/style.scss @@ -1,4 +1,4 @@ --- --- -@import "main" +@import "main";