Skip to content

Commit 5dbb853

Browse files
committed
Fix Docker images, sprites:generate and a favicon cors issue
1 parent db079c1 commit 5dbb853

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ENV ENABLE_SERVICE_WORKER=true
66
WORKDIR /devdocs
77

88
RUN apt-get update && \
9-
apt-get -y install git nodejs && \
9+
apt-get -y install git nodejs libcurl4 && \
1010
gem install bundler && \
1111
rm -rf /var/lib/apt/lists/*
1212

Dockerfile-alpine

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ WORKDIR /devdocs
77

88
COPY . /devdocs
99

10-
RUN apk --update add nodejs build-base libstdc++ gzip git zlib-dev && \
10+
RUN apk --update add nodejs build-base libstdc++ gzip git zlib-dev libcurl && \
1111
gem install bundler && \
1212
bundle install --system --without test && \
1313
thor docs:download --all && \

assets/javascripts/lib/favicon.coffee

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ withImage = (url, action) ->
99
action(imageCache[url])
1010
else
1111
img = new Image()
12+
img.crossOrigin = 'anonymous'
1213
img.src = url
1314
img.onload = () =>
1415
imageCache[url] = img

lib/tasks/sprites.thor

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ class SpritesCLI < Thor
3131
item[:dark_icon_fix] = needs_dark_icon_fix(item[:icon_32], bg_color)
3232
end
3333

34+
return unless items_with_icons.length > 0
35+
3436
log_details(items_with_icons, icons_per_row)
3537

3638
generate_spritesheet(16, items_with_icons, 'assets/images/sprites/docs.png') {|item| item[:icon_16]}

0 commit comments

Comments
 (0)