Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: plotly/orca
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.3.0
Choose a base ref
...
head repository: plotly/orca
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Mar 14, 2020

  1. build(deps): bump acorn from 5.7.1 to 5.7.4

    Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.1 to 5.7.4.
    - [Release notes](https://github.com/acornjs/acorn/releases)
    - [Commits](acornjs/acorn@5.7.1...5.7.4)
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Mar 14, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d3f7506 View commit details

Commits on Mar 15, 2020

  1. build(deps): bump minimist from 1.2.0 to 1.2.2

    Bumps [minimist](https://github.com/substack/minimist) from 1.2.0 to 1.2.2.
    - [Release notes](https://github.com/substack/minimist/releases)
    - [Commits](https://github.com/substack/minimist/compare/1.2.0...1.2.2)
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Mar 15, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    53d1984 View commit details

Commits on Mar 24, 2020

  1. Copy the full SHA
    b237153 View commit details

Commits on Mar 25, 2020

  1. Merge pull request #301 from plotly/fix-conda-no-sandbox

    add --no-sandbox flag to conda executable
    antoinerg authored Mar 25, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    223d529 View commit details

Commits on Mar 26, 2020

  1. Merge pull request #296 from plotly/dependabot/npm_and_yarn/minimist-…

    …1.2.2
    
    build(deps): bump minimist from 1.2.0 to 1.2.2
    antoinerg authored Mar 26, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d365434 View commit details
  2. Merge pull request #295 from plotly/dependabot/npm_and_yarn/acorn-5.7.4

    build(deps): bump acorn from 5.7.1 to 5.7.4
    antoinerg authored Mar 26, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    2dbe3ae View commit details
  3. update CHANGELOG for 1.3.1

    antoinerg committed Mar 26, 2020
    Copy the full SHA
    6193d06 View commit details
  4. 1.3.1

    antoinerg committed Mar 26, 2020
    Copy the full SHA
    9907ab6 View commit details

Commits on Apr 4, 2020

  1. build(deps): bump minimist from 1.2.2 to 1.2.3

    Bumps [minimist](https://github.com/substack/minimist) from 1.2.2 to 1.2.3.
    - [Release notes](https://github.com/substack/minimist/releases)
    - [Commits](https://github.com/substack/minimist/compare/1.2.2...1.2.3)
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Apr 4, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a7dda70 View commit details

Commits on Apr 7, 2020

  1. Copy the full SHA
    03f7f88 View commit details
  2. Copy the full SHA
    703adf1 View commit details
  3. Copy the full SHA
    da5c8f2 View commit details
  4. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    8c327ad View commit details
  5. Copy the full SHA
    5a7e277 View commit details
  6. Copy the full SHA
    3adf830 View commit details
  7. Copy the full SHA
    f7ed959 View commit details

Commits on Apr 8, 2020

  1. Merge pull request #309 from plotly/pr-full-json

    plotly-graph: add support for JSON exports
    antoinerg authored Apr 8, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    faa203e View commit details

Commits on Apr 9, 2020

  1. Copy the full SHA
    29152c1 View commit details

Commits on Apr 13, 2020

  1. Merge pull request #310 from justin-sleep/fix-build-dir-permissions

    Fix build directory permissions
    antoinerg authored Apr 13, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    ae6bf02 View commit details

Commits on Apr 24, 2020

  1. Copy the full SHA
    efd5511 View commit details
  2. Copy the full SHA
    7330d5c View commit details
  3. Merge pull request #312 from plotly/fix-print-pdf

    printToPDF: use Promise instead of callback
    antoinerg authored Apr 24, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    73f1980 View commit details

Commits on May 1, 2020

  1. Copy the full SHA
    7968dec View commit details
  2. test-image: update baselines following plotly.js 1.54.0

    With the introduction of shape selection, there's a new default layout attribute
    called "activeshape".
    antoinerg committed May 1, 2020
    Copy the full SHA
    a7a52be View commit details

Commits on May 4, 2020

  1. Copy the full SHA
    291de3a View commit details
  2. Copy the full SHA
    d4bd4ed View commit details
  3. Merge pull request #315 from plotly/plotly-1.54

    test-image: bump plotly.js to 1.54.0
    antoinerg authored May 4, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    6c6528e View commit details

Commits on May 20, 2020

  1. Copy the full SHA
    20e3496 View commit details
  2. Copy the full SHA
    78c7fc6 View commit details
  3. Copy the full SHA
    f9958e2 View commit details
  4. Copy the full SHA
    612fb80 View commit details
  5. Copy the full SHA
    1472579 View commit details
  6. Copy the full SHA
    ec3e0d9 View commit details
  7. Merge pull request #324 from plotly/update-package-lock

    update package-lock.json as of 2020-05-19
    antoinerg authored May 20, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    18bf8ac View commit details
  8. Merge pull request #323 from plotly/dash-preview-test-iframe

    dash-preview: gracefully fail on pages with iframes
    antoinerg authored May 20, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    6f4b8a5 View commit details

Commits on Sep 21, 2020

  1. Support k8s >= 1.16

    Switch to the `apps/v1` API; all the parameters we use are still
    supported.
    scjody committed Sep 21, 2020
    Copy the full SHA
    ab56439 View commit details
  2. Copy the full SHA
    9bd6812 View commit details

Commits on Sep 22, 2020

  1. Always push Docker image

    This allows easier debugging (a failing image can be pulled for
    examination) and is more consistent with our other builds.
    
    A failing image still won't end up in a release or get a tag based on
    the version.
    scjody committed Sep 22, 2020
    Copy the full SHA
    67a4802 View commit details
  2. Add libxss1

    This is needed to get `libXss.so.1`. Without it Orca now fails to start
    as a Docker container:
    
    ```
    + xvfb-run --auto-servernum --server-args '-screen 0 1024x768x24' /var/www/image-exporter/bin/orca.js serve --safe-mode --verbose --mathjax /mathjax/MathJax.js --topojson /plotly-geo-assets.js
    + [[ '' = \t\r\u\e ]]
    + sleep infinity
    /var/www/image-exporter/node_modules/electron/dist/electron: error while loading shared libraries: libXss.so.1: cannot open shared object file: No such file or directory
    ```
    scjody committed Sep 22, 2020
    Copy the full SHA
    00a0835 View commit details
  3. Merge pull request #346 from plotly/update-k8s-version

    Support k8s >= 1.16
    Jody McIntyre authored Sep 22, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a47c8b9 View commit details

Commits on Sep 25, 2020

  1. Copy the full SHA
    2257fe3 View commit details
  2. Copy the full SHA
    5432ff0 View commit details
  3. Copy the full SHA
    1e4c414 View commit details

Commits on Sep 28, 2020

  1. Merge pull request #347 from plotly/fix-baseline

    Update Inkscape and baseline images
    antoinerg authored Sep 28, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    c68d3df View commit details

Commits on Jun 23, 2021

  1. Copy the full SHA
    0b6ecde View commit details
  2. Copy the full SHA
    8cec3d2 View commit details
  3. Copy the full SHA
    0c93ca4 View commit details
  4. Copy the full SHA
    bc21aa9 View commit details
  5. Merge pull request #376 from plotly/pin-mathjax

    Fixes Dockerfile
    antoinerg authored Jun 23, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    192488b View commit details
  6. Merge pull request #377 from plotly/4.1-release

    Merge 4.1 release in master
    antoinerg authored Jun 23, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    9eb0138 View commit details
Showing with 46,247 additions and 55,350 deletions.
  1. +9 −8 .circleci/config.yml
  2. +1 −1 .circleci/test.sh
  3. +6 −0 CHANGELOG.md
  4. +6 −0 README.md
  5. +36 −27 deployment/Dockerfile
  6. +1 −1 deployment/kube/prod/frontend.yaml
  7. +1 −1 deployment/kube/prod/hpa.yaml
  8. +1 −1 deployment/kube/stage/frontend.yaml
  9. +1 −1 deployment/kube/stage/hpa.yaml
  10. +1,086 −1,977 package-lock.json
  11. +2 −2 package.json
  12. +1 −1 recipe/bin/orca
  13. +3 −1 src/component/plotly-dash-preview/constants.js
  14. +8 −0 src/component/plotly-dash-preview/render.js
  15. +3 −1 src/component/plotly-graph/constants.js
  16. +4 −0 src/component/plotly-graph/convert.js
  17. +27 −12 src/component/plotly-graph/render.js
  18. +1 −1 src/util/create-index.js
  19. +0 −8 test/dash-preview/mocks/1.json
  20. +0 −9 test/dash-preview/mocks/5.json
  21. +0 −8 test/dash-preview/mocks/report_alternating_footers.json
  22. +0 −9 test/dash-preview/mocks/report_alternating_margins.json
  23. +0 −8 test/dash-preview/mocks/report_defaults.json
  24. +0 −8 test/dash-preview/mocks/report_graph.json
  25. +0 −8 test/dash-preview/mocks/report_graph_dimensions.json
  26. +0 −8 test/dash-preview/mocks/report_page_numbers.json
  27. +0 −9 test/dash-preview/mocks/report_page_numbers_margins.json
  28. +0 −8 test/dash-preview/mocks/report_table.json
  29. BIN test/image/baselines/29.emf
  30. +2,235 −2,197 test/image/baselines/29.eps
  31. +1 −0 test/image/baselines/29.json
  32. BIN test/image/baselines/29.pdf
  33. BIN test/image/baselines/29.png
  34. +1 −1 test/image/baselines/29.svg
  35. BIN test/image/baselines/basic_heatmap.emf
  36. +452 −1,598 test/image/baselines/basic_heatmap.eps
  37. +1 −0 test/image/baselines/basic_heatmap.json
  38. BIN test/image/baselines/basic_heatmap.pdf
  39. BIN test/image/baselines/basic_heatmap.png
  40. +1 −1 test/image/baselines/basic_heatmap.svg
  41. BIN test/image/baselines/fonts.emf
  42. +3,581 −9,033 test/image/baselines/fonts.eps
  43. +1 −0 test/image/baselines/fonts.json
  44. BIN test/image/baselines/fonts.pdf
  45. BIN test/image/baselines/fonts.png
  46. +1 −1 test/image/baselines/fonts.svg
  47. BIN test/image/baselines/geo_choropleth-usa.emf
  48. +1,264 −1,194 test/image/baselines/geo_choropleth-usa.eps
  49. +1 −0 test/image/baselines/geo_choropleth-usa.json
  50. BIN test/image/baselines/geo_choropleth-usa.pdf
  51. BIN test/image/baselines/geo_choropleth-usa.png
  52. +1 −1 test/image/baselines/geo_choropleth-usa.svg
  53. BIN test/image/baselines/gl2d_14.emf
  54. +1 −1 test/image/baselines/gl2d_14.eps
  55. +1 −0 test/image/baselines/gl2d_14.json
  56. BIN test/image/baselines/gl2d_14.pdf
  57. +1 −1 test/image/baselines/gl2d_14.svg
  58. BIN test/image/baselines/gl3d_bunny.emf
  59. +19,837 −21,233 test/image/baselines/gl3d_bunny.eps
  60. +1 −0 test/image/baselines/gl3d_bunny.json
  61. BIN test/image/baselines/gl3d_bunny.pdf
  62. BIN test/image/baselines/gl3d_bunny.png
  63. +1 −1 test/image/baselines/gl3d_bunny.svg
  64. BIN test/image/baselines/mathjax.emf
  65. +17,567 −17,956 test/image/baselines/mathjax.eps
  66. +1 −0 test/image/baselines/mathjax.json
  67. BIN test/image/baselines/mathjax.pdf
  68. BIN test/image/baselines/mathjax.png
  69. +1 −1 test/image/baselines/mathjax.svg
  70. +29 −2 test/image/compare_images
  71. +4 −0 test/image/mocks/29.json
  72. +1 −0 test/image/mocks/basic_heatmap.json
  73. +1 −0 test/image/mocks/fonts.json
  74. +1 −0 test/image/mocks/geo_choropleth-usa.json
  75. +1 −0 test/image/mocks/gl2d_14.json
  76. +1 −1 test/image/mocks/gl3d_bunny.json
  77. +4 −0 test/image/mocks/mathjax.json
  78. +2 −2 test/image/render_mocks_cli
  79. +2 −2 test/integration/orca_serve_test.js
  80. +1 −1 test/unit/pdftops_test.js
  81. +18 −0 test/unit/plotly-dash-preview_test.js
  82. +34 −5 test/unit/plotly-graph_test.js
17 changes: 9 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -103,6 +103,7 @@ jobs:
- image: quay.io/plotly/image-exporter:$CIRCLE_SHA1
steps:
- checkout
- run: apt-get update && apt-get install -y jq
- run:
name: Run image test
command: ./.circleci/test-image.sh
@@ -147,23 +148,23 @@ jobs:
keys:
- v3-npm-
- run:
name: Build Docker image
name: Build and push Docker image
command: |
docker build -f deployment/Dockerfile -t quay.io/plotly/image-exporter:$CIRCLE_SHA1 .
docker login -u $DOCKER_USER -p $DOCKER_PASS quay.io
docker push quay.io/plotly/image-exporter:$CIRCLE_SHA1
docker tag quay.io/plotly/image-exporter:$CIRCLE_SHA1 quay.io/plotly/orca:$CIRCLE_SHA1
docker push quay.io/plotly/orca:$CIRCLE_SHA1
- run:
name: Smoke test Docker image
command: |
docker run -d -p 9091:9091/tcp --name imageserver quay.io/plotly/image-exporter:$CIRCLE_SHA1
docker run --network container:imageserver quay.io/plotly/wget wget --retry-connrefused --waitretry=1 -t 60 -O /dev/null --progress=dot http://localhost:9091/ping
- run:
name: Push Docker image to Quay
name: Tag and release Docker image
command: |
docker login -u $DOCKER_USER -p $DOCKER_PASS quay.io
docker push quay.io/plotly/image-exporter:$CIRCLE_SHA1
docker tag quay.io/plotly/image-exporter:$CIRCLE_SHA1 quay.io/plotly/orca:$CIRCLE_SHA1
docker push quay.io/plotly/orca:$CIRCLE_SHA1
# Is this a "version" commit? e.g. from `npm version`
# inspired by: https://discuss.circleci.com/t/git-tag-deploys-in-2-0/9493/4
if git log -1 --pretty=%B | grep "^[0-9]\+\.[0-9]\+\.[0-9]\+$"; then
2 changes: 1 addition & 1 deletion .circleci/test.sh
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ set +e
set +o pipefail

EXIT_STATE=0
MAX_AUTO_RETRY=5
MAX_AUTO_RETRY=2

# inspired by https://unix.stackexchange.com/a/82602
retry () {
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -9,6 +9,12 @@ https://github.com/plotly/orca/compare/vX.Y.Z...master

where X.Y.Z is the semver of most recent Orca release.

## [1.3.1] 2020-03-26

## Fixed

- Fix sandbox problem in the conda package for Linux [#301]

## [1.3.0] 2020-03-12

## Added
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -2,6 +2,12 @@

![orca logo](orca_logo.png)

<div align="center">
<a href="https://dash.plotly.com/project-maintenance">
<img src="https://dash.plotly.com/assets/images/maintained-by-plotly.png" width="600px" alt="Maintained by Plotly">
</a>
</div>

[![npm version](https://badge.fury.io/js/orca.svg)](https://badge.fury.io/js/orca)
[![MIT License](https://img.shields.io/badge/License-MIT-brightgreen.svg)](https://github.com/plotly/orca/blob/master/LICENSE)

63 changes: 36 additions & 27 deletions deployment/Dockerfile
Original file line number Diff line number Diff line change
@@ -6,46 +6,54 @@ FROM ubuntu:xenial

RUN apt-get update && apt-get install -y --no-install-recommends \
gnupg curl ca-certificates xz-utils wget libgtk2.0-0 libgconf-2-4 \
libxss1 \
&& rm -rf /var/lib/apt/lists/* && apt-get clean

# From https://github.com/nodejs/docker-node/blob/main/14/buster/Dockerfile
RUN groupadd --gid 1000 node \
&& useradd --uid 1000 --gid node --shell /bin/bash --create-home node

# gpg keys listed at https://github.com/nodejs/node#release-team
RUN set -ex \
&& for key in \
9554F04D7259F04124DE6B476D5A82AC7E37093B \
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
FD3A5288F042B6850C66B31F09FE44734EB7990E \
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
B9AE9905FFD7803F25714661B63B535A4C206CA9 \
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
56730D5401028683275BD23C23EFEFE93C4CFFFE \
; do \
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
done

ENV NPM_CONFIG_LOGLEVEL info
ENV NODE_VERSION 6.11.3
ENV NODE_VERSION 8.17.0

RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
&& case "${dpkgArch##*-}" in \
amd64) ARCH='x64';; \
ppc64el) ARCH='ppc64le';; \
s390x) ARCH='s390x';; \
arm64) ARCH='arm64';; \
armhf) ARCH='armv7l';; \
i386) ARCH='x86';; \
*) echo "unsupported architecture"; exit 1 ;; \
esac \
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
&& curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
# gpg keys listed at https://github.com/nodejs/node#release-keys
&& set -ex \
&& for key in \
4ED778F539E3634C779C87C6D7062848A1AB005C \
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
74F12602B6F1C4E913FAA37AD3A89613643B6201 \
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
108F52B48DB57BB0CC439B2997B01419BD92F80A \
B9E2F5981AA6E0CD28160D9FF13993A75599653C \
; do \
# From https://github.com/nodejs/docker-node/issues/1500#issuecomment-865693819
gpg --batch --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" || \
gpg --batch --keyserver hkp://keys.openpgp.org --recv-keys "$key" ; \
done \
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
&& grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
&& tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 \
&& tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \
&& rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs \
# smoke tests
&& node --version \
&& npm --version

####################
# Download fonts
@@ -79,8 +87,9 @@ RUN apt-get update -y && \
####################
# Download mathjax (same version as plotly.js extras/)

RUN curl -L https://github.com/plotly/plotly.js/archive/master.tar.gz \
| tar -xvzf - --strip-components=3 plotly.js-master/dist/extras/mathjax
RUN mkdir /mathjax && cd /mathjax && \
curl -L https://github.com/mathjax/MathJax/archive/2.3.0.tar.gz \
| tar -xvzf - --strip-components=2 MathJax-2.3.0/unpacked

####################
# Install and configure monit
@@ -95,7 +104,7 @@ RUN cd /opt && \
# Install latest stable Inkscape
RUN apt-get update && apt-get install -y software-properties-common python-software-properties \
&& add-apt-repository -y ppa:inkscape.dev/stable \
&& apt-get update && apt-get install -y inkscape=0.92.4+68~ubuntu16.04.1 \
&& apt-get update && apt-get install -y inkscape=0.92.5+68~ubuntu16.04.1 \
&& rm -rf /var/lib/apt/lists/* && apt-get clean

# Copy Inkscape defaults
@@ -114,7 +123,7 @@ COPY deployment/ImageMagickPolicy.xml /etc/ImageMagick-6/policy.xml
####################
# Copy and set up Orca

RUN apt-get update && apt-get install -y chromium-browser fonts-liberation xvfb poppler-utils git \
RUN apt-get update && apt-get install -y chromium-browser fonts-liberation xvfb poppler-utils git libxss1 \
&& rm -rf /var/lib/apt/lists/* && apt-get clean

COPY package.json /var/www/image-exporter/
2 changes: 1 addition & 1 deletion deployment/kube/prod/frontend.yaml
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
# stage version. When updating this file, please check if your changes
# need to be made to the other version.

apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: imageserver
2 changes: 1 addition & 1 deletion deployment/kube/prod/hpa.yaml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ metadata:
name: imageserver
spec:
scaleTargetRef:
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
name: imageserver
# Set this to 3x "min-nodes":
2 changes: 1 addition & 1 deletion deployment/kube/stage/frontend.yaml
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
# prod version. When updating this file, please check if your changes
# need to be made to the other version.

apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
2 changes: 1 addition & 1 deletion deployment/kube/stage/hpa.yaml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ metadata:
name: imageserver
spec:
scaleTargetRef:
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
name: imageserver
# Set this to 3x "min-nodes":
Loading