From 6fcc2442c618a1006f29aefb57d7bbe290af77a8 Mon Sep 17 00:00:00 2001 From: Kevin Grandon Date: Thu, 11 Jan 2018 14:52:25 -0800 Subject: [PATCH] Use web base docker image https://github.com/fusionjs/fusion-react-async/pull/23 --- .buildkite/xvfb_daemon_run | 8 -------- .buildkite/xvfb_init | 23 ----------------------- Dockerfile | 2 +- 3 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 .buildkite/xvfb_daemon_run delete mode 100644 .buildkite/xvfb_init diff --git a/.buildkite/xvfb_daemon_run b/.buildkite/xvfb_daemon_run deleted file mode 100644 index 6ba4112..0000000 --- a/.buildkite/xvfb_daemon_run +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -export DISPLAY=:99 -/etc/init.d/xvfb start -sleep 1 -$@ -exit_value=$? -/etc/init.d/xvfb stop -exit $exit_value diff --git a/.buildkite/xvfb_init b/.buildkite/xvfb_init deleted file mode 100644 index 7e2890d..0000000 --- a/.buildkite/xvfb_init +++ /dev/null @@ -1,23 +0,0 @@ -XVFB=/usr/bin/Xvfb -XVFBARGS="$DISPLAY -ac -screen 0 1024x768x16 +extension RANDR" -PIDFILE=/var/xvfb_${DISPLAY:1}.pid -case "$1" in - start) - echo -n "Starting virtual X frame buffer: Xvfb" - /sbin/start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile --background --exec $XVFB -- $XVFBARGS - echo "." - ;; - stop) - echo -n "Stopping virtual X frame buffer: Xvfb" - /sbin/start-stop-daemon --stop --quiet --pidfile $PIDFILE - echo "." - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "Usage: /etc/init.d/xvfb {start|stop|restart}" - exit 1 -esac -exit 0 diff --git a/Dockerfile b/Dockerfile index 4d77353..9647eff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:8.9.0 +FROM uber/web-base-image:1.0.0 WORKDIR /fusion-react-async