The Unified and Autonomous Development Platform
Add Dockerfile and update some cispec image names
Robin Shen4ff5472b3d52
diff --git a/server-plugin/server-plugin-cispec-laravel/Dockerfile b/server-plugin/server-plugin-cispec-laravel/Dockerfilenew file mode 100644index 0000000000..b128088ff1--- /dev/null+++ b/server-plugin/server-plugin-cispec-laravel/Dockerfile@@ -0,0 +1,10 @@+FROM php:7.3-fpm++RUN apt-get update --fix-missing && apt-get install -y \+ git wget zip unzip nodejs+RUN wget https://phar.phpunit.de/phpunit.phar \+&& chmod +x phpunit.phar \+&& mv phpunit.phar /usr/local/bin/phpunit+RUN wget https://getcomposer.org/composer.phar \+&& chmod +x composer.phar \+&& mv composer.phar /usr/local/bin/composerdiff --git a/server-plugin/server-plugin-cispec-laravel/src/main/java/io/onedev/server/plugin/cispec/laravel/DefaultLaravelCISpecProvider.java b/server-plugin/server-plugin-cispec-laravel/src/main/java/io/onedev/server/plugin/cispec/laravel/DefaultLaravelCISpecProvider.javaindex 722303dd3d..46d4890eb9 100644--- a/server-plugin/server-plugin-cispec-laravel/src/main/java/io/onedev/server/plugin/cispec/laravel/DefaultLaravelCISpecProvider.java+++ b/server-plugin/server-plugin-cispec-laravel/src/main/java/io/onedev/server/plugin/cispec/laravel/DefaultLaravelCISpecProvider.java@@ -31,7 +31,7 @@ public class DefaultLaravelCISpecProvider implements DefaultCISpecProvider {job.setName("ci");- job.setImage("1dev/php7.3:laravel");+ job.setImage("1dev/cispec-php:7.3-laravel");if (content.indexOf("laravel/framework") != -1) {job.setCommands(Lists.newArrayList(diff --git a/server-plugin/server-plugin-cispec-node/Dockerfile b/server-plugin/server-plugin-cispec-node/Dockerfilenew file mode 100644index 0000000000..dc73eb2c60--- /dev/null+++ b/server-plugin/server-plugin-cispec-node/Dockerfile@@ -0,0 +1,5 @@+FROM node:10.16.1-alpine++RUN apk add chromium+ENV CHROME_BIN /usr/bin/chromium-browser+ENV CHROMIUM_USER_FLAGS --no-sandboxdiff --git a/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/DefaultNodeCISpecProvider.java b/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/DefaultNodeCISpecProvider.javaindex 4165f552f7..7b09a9ee29 100644--- a/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/DefaultNodeCISpecProvider.java+++ b/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/DefaultNodeCISpecProvider.java@@ -55,7 +55,7 @@ public class DefaultNodeCISpecProvider implements DefaultCISpecProvider {if (content.indexOf("angular/core") != -1) { // Recognize angular projects- job.setImage("1dev/node:10.16-alpine-chrome");+ job.setImage("1dev/cispec-node:10.16-alpine-chrome");version = jsonNode.findValue("version").asText();