From 4dae14599b4307a2c5d9198063873b9e67796c94 Mon Sep 17 00:00:00 2001
From: Jason Wall <jason@walljm.com>
Date: Tue, 18 Aug 2020 19:17:23 -0400
Subject: [PATCH] update gitlab ci

---
 .gitlab-ci.yml                | 17 ++---------------
 docker-android/Dockerfile     | 26 ++++++++++++++++++++++++++
 docker-node-chrome/Dockerfile | 15 +++++++++++++++
 3 files changed, 43 insertions(+), 15 deletions(-)
 create mode 100644 docker-android/Dockerfile
 create mode 100644 docker-node-chrome/Dockerfile

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f6d135da..a5173576 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,25 +1,12 @@
 stages:
-  - report
   - test
   - build
 
-report:
-  stage: report
-  image: node:14.5.0
-  script:
-    - npm install
-    - set +e
-    - npm outdated
-    - npm audit
-    - set -e
-  only:
-    - schedules
-
 build:
   stage: build
   image: node:14.5.0
   variables:
-    NODE_OPTIONS: '--max_old_space_size=2048'
+    NODE_OPTIONS: "--max_old_space_size=2048"
   script:
     - cd ./src
     - npm ci
@@ -32,7 +19,7 @@ test:
   stage: test
   image: walljm/node-chrome-headless:14.8.0
   variables:
-    NODE_OPTIONS: '--max_old_space_size=2048'
+    NODE_OPTIONS: "--max_old_space_size=2048"
   script:
     - cd ./src
     - npm ci
diff --git a/docker-android/Dockerfile b/docker-android/Dockerfile
new file mode 100644
index 00000000..d735a49a
--- /dev/null
+++ b/docker-android/Dockerfile
@@ -0,0 +1,26 @@
+FROM gradle:4.10.0-jdk8
+
+USER root
+ENV SDK_URL="https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip" \
+    ANDROID_HOME="/usr/local/android-sdk" \
+    ANDROID_VERSION=28 \
+    ANDROID_BUILD_TOOLS_VERSION=27.0.3
+
+# Download Android SDK
+RUN mkdir "$ANDROID_HOME" .android \
+    && cd "$ANDROID_HOME" \
+    && curl -o sdk.zip $SDK_URL \
+    && unzip sdk.zip \
+    && rm sdk.zip \
+    && mkdir "$ANDROID_HOME/licenses" || true \
+    && echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > "$ANDROID_HOME/licenses/android-sdk-license"
+#    && yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses
+
+# Install Android Build Tool and Libraries
+RUN $ANDROID_HOME/tools/bin/sdkmanager --update
+RUN $ANDROID_HOME/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \
+    "platforms;android-${ANDROID_VERSION}" \
+    "platform-tools"
+
+# Install Build Essentials
+RUN apt-get update && apt-get install build-essential -y && apt-get install file -y && apt-get install apt-utils -y
\ No newline at end of file
diff --git a/docker-node-chrome/Dockerfile b/docker-node-chrome/Dockerfile
new file mode 100644
index 00000000..a8bcd65c
--- /dev/null
+++ b/docker-node-chrome/Dockerfile
@@ -0,0 +1,15 @@
+FROM node:14.8.0-buster-slim
+
+RUN apt-get update -qqy \
+  && apt-get -qqy install \
+       dumb-init gnupg wget ca-certificates apt-transport-https \
+       ttf-wqy-zenhei \
+       git curl unzip build-essential ruby ruby-dev ruby-ffi gcc make \
+  && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
+
+RUN wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | apt-key add - \
+  && echo "deb https://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list \
+  && apt-get update -qqy \
+  && apt-get -qqy install google-chrome-unstable \
+  && rm /etc/apt/sources.list.d/google-chrome.list \
+  && rm -rf /var/lib/apt/lists/* /var/cache/apt/*