From dd372629510feea8da61d9928c443f7ccee08f38 Mon Sep 17 00:00:00 2001 From: Sean Sube Date: Thu, 20 Feb 2020 15:55:38 -0600 Subject: [PATCH] feat(container): install bunyan and jq for log parsing (#263) * feat(container): install bunyan and jq for log parsing * fix(docs): replace docker cloud link with paywall --- Dockerfile.alpine | 7 ++++++- Dockerfile.stretch | 8 +++++++- README.md | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 1317c9c..d455aec 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,5 +1,11 @@ FROM node:11-alpine +# dependencies: log filtering +RUN apk add --update jq \ + && rm -rf /var/cache/apk/* \ + && yarn global add bunyan +ENV PATH="${PATH}:$(yarn global bin)" + # copy config, which changes rarely COPY docs/config-docker.yml /root/.salty-dog.yml @@ -14,7 +20,6 @@ COPY out/index.js /salty-dog/out/index.js # set up as global cli tool WORKDIR /salty-dog RUN yarn global add file:$(pwd) -ENV PATH="${PATH}:$(yarn global bin)" COPY rules /salty-dog/rules diff --git a/Dockerfile.stretch b/Dockerfile.stretch index 8b9d084..382b2fa 100644 --- a/Dockerfile.stretch +++ b/Dockerfile.stretch @@ -1,5 +1,12 @@ FROM node:11-stretch +# dependencies: log filtering +RUN apt-get update -y \ + && apt-get install -y jq \ + && rm -rf /var/lib/apt/lists/* \ + && yarn global add bunyan +ENV PATH="${PATH}:$(yarn global bin)" + # copy config, which changes rarely COPY docs/config-docker.yml /root/.salty-dog.yml @@ -14,7 +21,6 @@ COPY out/index.js /salty-dog/out/index.js # set up as global cli tool WORKDIR /salty-dog RUN yarn global add file:$(pwd) -ENV PATH="${PATH}:$(yarn global bin)" COPY rules /salty-dog/rules diff --git a/README.md b/README.md index 2ee572e..07924df 100644 --- a/README.md +++ b/README.md @@ -145,7 +145,7 @@ docker build -t salty-dog:alpine -f Dockerfile.alpine . To run with Docker: `docker run --rm ssube/salty-dog:master` The latest semi-stable image is `ssube/salty-dog:master`. All -[tags are listed here](https://cloud.docker.com/repository/docker/ssube/salty-dog/tags). +[tags are listed here](https://hub.docker.com/r/ssube/salty-dog/tags). The Docker container is published for each branch and git tag, tagged with the git tag (or branch slug).