From 530f585b63cca0388b0601dd4d32d56f900222ff Mon Sep 17 00:00:00 2001 From: Patrick Kage Date: Fri, 18 Oct 2019 18:20:47 +0100 Subject: [PATCH] finalize app for deploy --- .dockerignore | 1 + Dockerfile | 66 +++----------------------------------------- docker-compose.yml | 9 ++++++ docker-entrypoint.sh | 3 -- scrape.js | 7 ++++- 5 files changed, 20 insertions(+), 66 deletions(-) create mode 100644 .dockerignore create mode 100644 docker-compose.yml delete mode 100644 docker-entrypoint.sh diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..600e365 --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +**/node_modules \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 45d6380..18272c7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,64 +1,6 @@ -ROM alpine:0.0 +FROM quay.io/ivanvanderbyl/docker-nightmare:latest -ENV NODE_VERSION 0.0.0 +ADD . /workspace +RUN npm install -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - binutils-gold \ - curl \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - "${NODE_KEYS[@]}" - ; 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 \ - && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.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.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt - -ENV YARN_VERSION 0.0.0 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - "${YARN_KEYS[@]}" - ; 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 \ - && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] +CMD "server.js" diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..17cc16d --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,9 @@ +version: "3.7" +services: + api: + image: "TBD" + ports: + - "3000:3000" + volumes: + - "instance/instance" + command: "server.js" diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh deleted file mode 100644 index 89730ed..0000000 --- a/docker-entrypoint.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh - -node server.js diff --git a/scrape.js b/scrape.js index 2a32857..47f5d5b 100644 --- a/scrape.js +++ b/scrape.js @@ -23,7 +23,12 @@ const parseNameString = name => { module.exports = opts => { const DEBUG = (opts && opts.debug) || false - const nightmare = Nightmare({ show: DEBUG }) + const nightmare = Nightmare({ + show: DEBUG, + switches: { + 'ignore-gpu-blacklist': true + } + }) return new Promise((resolve, reject) => { nightmare