Skip to content

Commit

Permalink
Update dependencies (#397)
Browse files Browse the repository at this point in the history 
* Add jekyll to dependencies

* Exclude optional / dev dashboard deps

* Tweak gulp tasks

* Dockerfile tweaks
  • Loading branch information
@marcinc
marcinc authored Nov 11, 2024
1 parent 059db23 commit 4cf7396
Show file tree
Hide file tree
Showing 27 changed files with 2,989 additions and 2,057 deletions.
2 changes: 2 additions & 0 deletions .dockerignore
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.DS_Store
.bundle
.circleci/
.jekyll-cache/
.vscode
.git
.gitignore
Expand All @@ -16,3 +17,4 @@ skaffold.yaml
/k8s
/spec
/tmp
/dashboard/node_modules
17 changes: 14 additions & 3 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,18 @@ RUN bundle config set deployment 'true'
RUN bundle config set without 'development test'
RUN bundle install --jobs 20 --retry 5

# build the UI
RUN cd dashboard && npm install --omit=dev && npm rebuild node-sass && npm install -g sass-migrator && sass-migrator division **/*.scss && node_modules/.bin/gulp release
# build the dashboard elements
RUN cd dashboard && npm install --omit=optional --omit=dev && npm audit fix && npm rebuild node-sass && npm install -g sass-migrator && sass-migrator division **/*.scss && rm -rf ./compiled && node_modules/.bin/gulp build

##############################################################
# Stage: jekyll -- generate dashboard html files
FROM jekyll/jekyll:4.2.0 AS jekyll

WORKDIR /app

COPY --from=builder --chown=jekyll:jekyll /app /app

RUN cd dashboard && jekyll build --trace -s ./src/html -d ./tmp && cp ./tmp/*.html ./compiled && rm -rf ./tmp

##############################################################
# Stage: final
Expand All @@ -59,7 +69,7 @@ RUN addgroup -g 1000 -S appuser \
USER 1000

COPY --from=builder /usr/local/bundle/ /usr/local/bundle/
COPY --from=builder --chown=1000:1000 /app $APP_PATH
COPY --from=jekyll --chown=1000:1000 /app $APP_PATH

WORKDIR $APP_PATH

Expand All @@ -70,3 +80,4 @@ ENV PATH $APP_PATH/bin:$PATH

ENTRYPOINT ["bin/krane"]
CMD ["report", "--incluster"]

63 changes: 57 additions & 6 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ PATH
docile
facets
hashie
jekyll (~> 4.3)
kubeclient
memoist
openid_connect
Expand All @@ -24,14 +25,15 @@ GEM
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.1)
public_suffix (>= 2.0.2, < 6.0)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
aes_key_wrap (1.1.0)
ast (2.4.2)
attr_required (1.0.1)
base64 (0.1.1)
bindata (2.5.0)
byebug (11.1.3)
colorator (1.1.0)
colorize (1.1.0)
commander (4.6.0)
highline (~> 2.0.0)
Expand All @@ -40,8 +42,12 @@ GEM
docile (1.4.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
email_validator (2.2.4)
activemodel
eventmachine (1.2.7)
facets (3.1.0)
factory_bot (6.2.1)
activesupport (>= 5.0.0)
Expand All @@ -52,10 +58,12 @@ GEM
faraday-follow_redirects (0.3.0)
faraday (>= 1, < 3)
faraday-net_http (3.0.2)
ffi (1.15.5)
ffi (1.17.0)
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
rake
forwardable-extended (2.6.0)
google-protobuf (3.25.5)
hashie (5.0.0)
highline (2.0.3)
http (5.1.1)
Expand All @@ -67,8 +75,29 @@ GEM
http-cookie (1.0.5)
domain_name (~> 0.5)
http-form_data (2.3.0)
http_parser.rb (0.8.0)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
jekyll (4.3.0)
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-sass-converter (3.0.0)
sass-embedded (~> 1.54)
jekyll-watch (2.2.1)
listen (~> 3.0)
json (2.6.3)
json-jwt (1.16.6)
activesupport (>= 4.2)
Expand All @@ -79,18 +108,27 @@ GEM
faraday-follow_redirects
jsonpath (1.1.2)
multi_json
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
kubeclient (4.11.0)
http (>= 3.0, < 6.0)
jsonpath (~> 1.0)
recursive-open-struct (~> 1.1, >= 1.1.1)
rest-client (~> 2.0)
language_server-protocol (3.17.0.3)
liquid (4.0.4)
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
llhttp-ffi (0.4.0)
ffi-compiler (~> 1.0)
rake (~> 13.0)
mail (2.7.1)
mini_mime (>= 0.1.1)
memoist (0.16.2)
mercenary (0.4.0)
mime-types (3.4.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2022.0105)
Expand All @@ -115,11 +153,13 @@ GEM
parser (3.2.2.3)
ast (~> 2.4.1)
racc
pathutil (0.16.2)
forwardable-extended (~> 2.6)
power_assert (2.0.3)
profile (0.4.0)
psych (5.1.2)
stringio
public_suffix (5.0.1)
public_suffix (5.1.1)
racc (1.7.1)
rack (3.0.9.1)
rack-oauth2 (2.2.0)
Expand All @@ -130,7 +170,10 @@ GEM
json-jwt (>= 1.11.0)
rack (>= 2.1.0)
rainbow (3.1.1)
rake (13.0.6)
rake (13.2.1)
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
rdoc (6.5.1.1)
psych (>= 4.0.0)
recursive-open-struct (1.1.3)
Expand All @@ -144,6 +187,7 @@ GEM
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.3.9)
rouge (4.4.0)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
Expand Down Expand Up @@ -176,6 +220,10 @@ GEM
ruby-prof (1.6.3)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
safe_yaml (1.0.5)
sass-embedded (1.63.6)
google-protobuf (~> 3.23)
rake (>= 13.0.0)
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
Expand All @@ -189,21 +237,24 @@ GEM
attr_required (>= 0.0.5)
faraday (~> 2.0)
faraday-follow_redirects
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
test-unit (3.6.1)
power_assert
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.8.2)
unicode-display_width (2.4.2)
unicode-display_width (2.6.0)
validate_url (1.0.15)
activemodel (>= 3.0.0)
public_suffix
webfinger (2.1.2)
activesupport
faraday (~> 2.0)
faraday-follow_redirects
webrick (1.9.0)

PLATFORMS
ruby
Expand Down
Loading

0 comments on commit 4cf7396

Please sign in to comment.