From a84c1b2ced58b7ccea0f6d9909dcddfb599d5f48 Mon Sep 17 00:00:00 2001 From: James Cropcho Date: Wed, 25 Apr 2018 13:58:12 -0400 Subject: [PATCH 1/9] Reverting Docker image name --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 22773155..242937a9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -105,19 +105,19 @@ jobs: - run: name: Build Docker image command: | - docker build -f deployment/Dockerfile -t quay.io/plotly/orca:$CIRCLE_SHA1 . + docker build -f deployment/Dockerfile -t quay.io/plotly/image-exporter:$CIRCLE_SHA1 . - run: name: Smoke test Docker image command: | - docker run -d -p 9091:9091/tcp --name imageserver quay.io/plotly/orca:$CIRCLE_SHA1 + 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 command: | docker login -u $DOCKER_USER -p $DOCKER_PASS quay.io - docker tag quay.io/plotly/orca:$CIRCLE_SHA1 quay.io/plotly/orca:$CIRCLE_BRANCH - docker push quay.io/plotly/orca:$CIRCLE_SHA1 - docker push quay.io/plotly/orca:$CIRCLE_BRANCH + docker tag quay.io/plotly/image-exporter:$CIRCLE_SHA1 quay.io/plotly/image-exporter:$CIRCLE_BRANCH + docker push quay.io/plotly/image-exporter:$CIRCLE_SHA1 + docker push quay.io/plotly/image-exporter:$CIRCLE_BRANCH - save_cache: paths: - node_modules From ac7f956e262fb9a3b5e1c272148f7e5c627e1e38 Mon Sep 17 00:00:00 2001 From: James Cropcho Date: Wed, 25 Apr 2018 14:01:51 -0400 Subject: [PATCH 2/9] Continuted reversion of Docker image name --- deployment/Dockerfile | 8 ++++---- deployment/kube/prod/frontend.yaml | 2 +- deployment/kube/stage/frontend.yaml | 2 +- deployment/roles/update/tasks/main.yml | 2 +- deployment/run_server | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/deployment/Dockerfile b/deployment/Dockerfile index 9e90729c..11b7a647 100644 --- a/deployment/Dockerfile +++ b/deployment/Dockerfile @@ -93,11 +93,11 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key apt-get install -y google-chrome-stable xvfb poppler-utils && \ rm -rf /var/lib/apt/lists/* && apt-get clean -COPY package.json /var/www/orca/ -COPY bin /var/www/orca/bin -COPY src /var/www/orca/src +COPY package.json /var/www/image-exporter/ +COPY bin /var/www/image-exporter/bin +COPY src /var/www/image-exporter/src -WORKDIR /var/www/orca +WORKDIR /var/www/image-exporter RUN npm install && mkdir build #################### diff --git a/deployment/kube/prod/frontend.yaml b/deployment/kube/prod/frontend.yaml index 6ec3269f..e35eded8 100644 --- a/deployment/kube/prod/frontend.yaml +++ b/deployment/kube/prod/frontend.yaml @@ -28,7 +28,7 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: imageserver-app - image: quay.io/plotly/orca:master + image: quay.io/plotly/image-exporter:master env: - name: MAPBOX_ACCESS_TOKEN valueFrom: diff --git a/deployment/kube/stage/frontend.yaml b/deployment/kube/stage/frontend.yaml index 2c413739..22dc91e4 100644 --- a/deployment/kube/stage/frontend.yaml +++ b/deployment/kube/stage/frontend.yaml @@ -28,7 +28,7 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: imageserver-app - image: quay.io/plotly/orca:master + image: quay.io/plotly/image-exporter:master args: ["--plotlyJS", "https://stage.plot.ly/static/plotlyjs/build/plotlyjs-bundle.js"] env: - name: MAPBOX_ACCESS_TOKEN diff --git a/deployment/roles/update/tasks/main.yml b/deployment/roles/update/tasks/main.yml index f875e0c3..30199e22 100644 --- a/deployment/roles/update/tasks/main.yml +++ b/deployment/roles/update/tasks/main.yml @@ -8,4 +8,4 @@ local_action: shell curl -o /dev/null --silent --head --fail https://quay.io/api/v1/repository/plotly/orca/tag/{{ sha1_to_deploy }}/images - name: Rollout new image - local_action: command kubectl set image deployments/imageserver imageserver-app=quay.io/plotly/orca:{{ sha1_to_deploy }} + local_action: command kubectl set image deployments/imageserver imageserver-app=quay.io/plotly/image-exporter:{{ sha1_to_deploy }} diff --git a/deployment/run_server b/deployment/run_server index 39243977..e4429f70 100755 --- a/deployment/run_server +++ b/deployment/run_server @@ -2,7 +2,7 @@ fc-cache -v /usr/share/fonts/user -BUILD_DIR=/var/www/orca/build +BUILD_DIR=/var/www/image-exporter/build if [[ -n "${PLOTLY_JS_SRC}" ]]; then # Fetch plotly js bundle and save it locally: mkdir -p $BUILD_DIR From ec5929b0ac57521ebdb26050227907460dcde8e8 Mon Sep 17 00:00:00 2001 From: James Cropcho Date: Wed, 25 Apr 2018 14:14:53 -0400 Subject: [PATCH 3/9] Fixing Quay issue regarding Orca vs Image-Exporter --- deployment/roles/update/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/roles/update/tasks/main.yml b/deployment/roles/update/tasks/main.yml index 30199e22..220b5b71 100644 --- a/deployment/roles/update/tasks/main.yml +++ b/deployment/roles/update/tasks/main.yml @@ -5,7 +5,7 @@ - debug: msg="Deploying rev {{ sha1_to_deploy }}" - name: Ensure image exists - local_action: shell curl -o /dev/null --silent --head --fail https://quay.io/api/v1/repository/plotly/orca/tag/{{ sha1_to_deploy }}/images + local_action: shell curl -o /dev/null --silent --head --fail https://quay.io/api/v1/repository/plotly/image-exporter/tag/{{ sha1_to_deploy }}/images - name: Rollout new image local_action: command kubectl set image deployments/imageserver imageserver-app=quay.io/plotly/image-exporter:{{ sha1_to_deploy }} From b57bfc81db5ffedb8d982aca5b95cb5f811f0dae Mon Sep 17 00:00:00 2001 From: James Cropcho Date: Wed, 25 Apr 2018 16:18:29 -0400 Subject: [PATCH 4/9] "Not sure we want that Open-source Report Creator App bit in our title." "just orca here not @plotly/orca" --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 85d0642e..2d17067c 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -# Plotly Orca: Open-source Report Creator App +# Plotly Orca [![CircleCI](https://circleci.com/gh/plotly/orca.svg?style=svg)](https://circleci.com/gh/plotly/orca) This repo contains source code for: - `orca` standalone app, -- `@plotly/orca` npm package, and +- `orca` npm package, and - Plotly's image server ## `orca` standalone app @@ -52,14 +52,14 @@ cmd <- sprintf("orca '%s' -o r-export-test.png", json) system(cmd) ``` -## `@plotly/orca` npm package +## `orca` npm package ### Install With Node.js (v6.x or v8.x) and npm installed: ``` -$ npm install -g electron @plotly/orca +$ npm install -g electron orca ``` which installs two executables `orca` and `plotly-export-server` From 9aefae340488aac8d6767bc60e23c932c50f99d6 Mon Sep 17 00:00:00 2001 From: James Cropcho Date: Wed, 25 Apr 2018 17:21:21 -0400 Subject: [PATCH 5/9] Trying to add libgtk2.0-0 installation as a means to fix Docker smoketest --- deployment/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/Dockerfile b/deployment/Dockerfile index 11b7a647..8671fb9b 100644 --- a/deployment/Dockerfile +++ b/deployment/Dockerfile @@ -5,7 +5,7 @@ FROM ubuntu:xenial # From: https://github.com/nodejs/docker-node/blob/master/6.11/Dockerfile RUN apt-get update && apt-get install -y --no-install-recommends \ - gnupg curl ca-certificates xz-utils wget libgconf-2-4 \ + gnupg curl ca-certificates xz-utils wget libgtk2.0-0 libgconf-2-4 \ && rm -rf /var/lib/apt/lists/* && apt-get clean RUN groupadd --gid 1000 node \ From 2293649fdf6fbbd004472488fef560e7d4f46e60 Mon Sep 17 00:00:00 2001 From: James Cropcho Date: Wed, 25 Apr 2018 17:29:16 -0400 Subject: [PATCH 6/9] Triggering a build due to nondeterministic (?) CircleCI failure From d12cc3e4d227a58c16a7fb6ef927ba0f4ba5dc12 Mon Sep 17 00:00:00 2001 From: James Cropcho Date: Tue, 1 May 2018 15:54:42 -0400 Subject: [PATCH 7/9] "test/integration/orca_test.js would be best." --- test/integration/{plotly-orca_test.js => orca_test.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename test/integration/{plotly-orca_test.js => orca_test.js} (100%) diff --git a/test/integration/plotly-orca_test.js b/test/integration/orca_test.js similarity index 100% rename from test/integration/plotly-orca_test.js rename to test/integration/orca_test.js From 94d1e96073537fee88c1f560e457a0c41c1c4c94 Mon Sep 17 00:00:00 2001 From: James Cropcho Date: Tue, 1 May 2018 15:55:01 -0400 Subject: [PATCH 8/9] "let's go with orca-build" --- src/util/pdftops.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/pdftops.js b/src/util/pdftops.js index f20cac07..490700b9 100644 --- a/src/util/pdftops.js +++ b/src/util/pdftops.js @@ -6,7 +6,7 @@ const series = require('run-series') const uuid = require('uuid/v4') const os = require('os') -const PATH_TO_BUILD = path.join(os.tmpdir(), 'plotly-orca-build') +const PATH_TO_BUILD = path.join(os.tmpdir(), 'orca-build') try { fs.mkdirSync(PATH_TO_BUILD) } catch (e) {} From 42b097e1ec866fd17d507721637b0d05d4e044c4 Mon Sep 17 00:00:00 2001 From: James Cropcho Date: Tue, 1 May 2018 15:55:27 -0400 Subject: [PATCH 9/9] "same here orca-build" --- src/util/create-index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/create-index.js b/src/util/create-index.js index f5154719..ae52c0c6 100644 --- a/src/util/create-index.js +++ b/src/util/create-index.js @@ -5,7 +5,7 @@ const isNonEmptyString = require('./is-non-empty-string') const os = require('os') const COMPONENT_GLOBAL = 'PlotlyExporterComponent' -const PATH_TO_BUILD = path.join(os.tmpdir(), 'plotly-orca-build') +const PATH_TO_BUILD = path.join(os.tmpdir(), 'orca-build') try { fs.mkdirSync(PATH_TO_BUILD) } catch (e) {}