add some tests

vulhub · Aug 12, 2020 · 5a895ec · 5a895ec
1 parent 3cd5b6d
commit 5a895ec
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 40 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -24,6 +24,9 @@ jobs:
         bash tests/image-build.sh base/ffmpeg/2.8.4 "vulhub/ffmpeg:2.8.4"
         bash tests/image-build.sh base/ffmpeg/3.2.4 "vulhub/ffmpeg:3.2.4"
         bash tests/images-build.sh base/ffmpeg/2.8.4-php base/ffmpeg/3.2.4-php
+    - name: git
+      run: |
+        bash tests/images-build.sh base/git/2.12.2
 
   images-test:
 
@@ -32,17 +35,50 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+    - name: influxdb
+      run: |
+        bash tests/images-build.sh base/influxdb/1.6.6 base/influxdb/1.7.9
+    - name: jboss
+      run: |
+        bash tests/images-build.sh base/jboss/as-4.0.5 base/jboss/as-6.1.0
+    - name: jenkins
+      run: |
+        bash tests/images-build.sh base/jenkins/2.138 base/jenkins/2.46.1
+    - name: jira
+      run: |
+        bash tests/images-build.sh base/jira/8.1.0
+    - name: jmeter
+      run: |
+        bash tests/images-build.sh base/jmeter/3.3
+    - name: joomla
+      run: |
+        bash tests/images-build.sh base/joomla/3.4.5 base/joomla/3.7.0
+    - name: jupyter-notebook
+      run: |
+        bash tests/images-build.sh base/jupyter-notebook/5.2.2
+    - name: kibana
+      run: |
+        bash tests/images-build.sh base/kibana/5.6.12 base/kibana/6.5.4
+    # missed: httpd
+    - name: hadoop
+      run: |
+        bash tests/images-build.sh base/hadoop/2.8.1
     - name: discuz
       run: |
         bash tests/images-build.sh base/discuzx/3.4-20170801 base/discuzx/7.2
     - name: ghostscript
       run: |
         bash tests/image-build.sh base/ghostscript/9.21 "vulhub/ghostscript:9.21"
         bash tests/image-build.sh base/ghostscript/9.23 "vulhub/ghostscript:9.23"
-        bash tests/images-build.sh base/ghostscript/9.21/with-flask base/ghostscript/9.23/with-flask base/ghostscript/9.25 base/ghostscript/9.26
-    - name: git
-      run: |
-        bash tests/images-build.sh base/git/2.12.2
+        bash tests/image-build.sh base/ghostscript/9.25 "vulhub/ghostscript:9.25"
+        bash tests/image-build.sh base/ghostscript/9.26 "vulhub/ghostscript:9.26"
+        bash tests/images-build.sh base/ghostscript/9.21/with-flask base/ghostscript/9.23/with-flask
+    - name: imagemagick
+      run: |
+        bash tests/image-build.sh base/imagemagick/7.0.8-10 "vulhub/imagemagick:7.0.8-10"
+        bash tests/image-build.sh base/imagemagick/7.0.8-20 "vulhub/imagemagick:7.0.8-20"
+        bash tests/image-build.sh base/imagemagick/7.0.8-27 "vulhub/imagemagick:7.0.8-27"
+        bash tests/images-build.sh base/imagemagick/6.9.2 base/imagemagick/7.0.8-10-php base/imagemagick/7.0.8-20-php base/imagemagick/7.0.8-27-php
     - name: gitea
       run: |
         bash tests/images-build.sh base/gitea/1.4.0
@@ -52,6 +88,9 @@ jobs:
     - name: glassfish
       run: |
         bash tests/images-build.sh base/glassfish/4.1
+    - name: cleanup
+      run: |
+        bash tests/cleanup.sh
     - name: goahead
       run: |
         bash tests/images-build.sh base/goahead/3.6.4
@@ -70,9 +109,6 @@ jobs:
     - name: aria2
       run: |
         bash tests/images-build.sh base/aria2/1.18.8
-    - name: cleanup
-      run: |
-        bash tests/cleanup.sh
     - name: baselinux
       run: |
         bash tests/images-build.sh base/baselinux/centos-6

diff --git a/base/httpd/2.2/Dockerfile b/base/httpd/2.2/Dockerfile
diff --git a/base/httpd/2.4/Dockerfile b/base/httpd/2.4/Dockerfile
diff --git a/base/java/8u112-jdk/Dockerfile b/base/java/8u112-jdk/Dockerfile
diff --git a/base/java/jdk6/Dockerfile b/base/java/jdk6/Dockerfile
diff --git a/base/java/jdk7/Dockerfile b/base/java/jdk7/Dockerfile
diff --git a/base/java/jdk8/Dockerfile b/base/java/jdk8/Dockerfile
diff --git a/base/java/jre6/Dockerfile b/base/java/jre6/Dockerfile
diff --git a/base/java/jre7/Dockerfile b/base/java/jre7/Dockerfile
diff --git a/base/java/jre8/Dockerfile b/base/java/jre8/Dockerfile
diff --git a/base/java/oracle-jdk-6/Dockerfile b/base/java/oracle-jdk-6/Dockerfile
diff --git a/base/httpd/2.4/with-ssi/Dockerfile → httpd/ssi-rce/Dockerfile b/base/httpd/2.4/with-ssi/Dockerfile → httpd/ssi-rce/Dockerfile
diff --git a/httpd/ssi-rce/docker-compose.yml b/httpd/ssi-rce/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
  apache:
-   image: vulhub/httpd:2.4-with-ssi
+   build: .
    ports:
     - "8080:80"
    volumes: