From 84d78463bdc98a45647e1f0ef2802caeb2c8c7c8 Mon Sep 17 00:00:00 2001
From: mo khan <mo@mokhan.ca>
Date: Tue, 3 Sep 2019 18:57:41 -0600
Subject: install bats in docker image

---
 .dockerignore | 2 +-
 Dockerfile    | 6 +++---
 bin/test      | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index ec635fc..088fa3b 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,4 @@
-.git
+.git*
 tmp
 node_modules
 *.pdf
diff --git a/Dockerfile b/Dockerfile
index 8113b4c..233258f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,12 +3,12 @@ MAINTAINER mo@mokhan.ca
 
 RUN apk update && \
   apk upgrade && \
-  apk add ruby nodejs yarn chromium nss freetype freetype-dev harfbuzz ca-certificates ttf-freefont && \
+  apk add git bash ruby nodejs yarn chromium nss freetype freetype-dev harfbuzz ca-certificates ttf-freefont && \
   gem install bundler:'~> 2.0' --no-document && \
   mkdir -p /code
-
+RUN git clone https://github.com/sstephenson/bats.git /opt/bats && cd /opt/bats && ./install.sh /usr/local
 WORKDIR /code
 COPY . /code
-RUN bundle install --jobs $(nproc) && yarn install && mvn install
+RUN bundle install --jobs $(nproc) && yarn install
 RUN sed -i 's/{ headless: true }/{ headless: true, executablePath: "\/usr\/bin\/chromium-browser", args: ["--no-sandbox", "--disable-setuid-sandbox"] }/g' node_modules/mdpdf/src/index.js
 CMD ["bundle", "exec", "rake", "test"]
diff --git a/bin/test b/bin/test
index 7d2ab7f..ff3228e 100755
--- a/bin/test
+++ b/bin/test
@@ -4,6 +4,5 @@ set -e
 
 cd "$(dirname "$0")/.."
 
-./bin/setup
 export PATH="./vendor/bats/bin:./bin:$PATH"
 bats --tap test
-- 
cgit v1.2.3