Template clean up

Author: cableman

.github/workflows/trivy-analysis.yml

@@ -9,7 +9,7 @@ on:
     - cron: "0 8 * * 6"
 
 jobs:
-  ubuntu-php:
+  ubuntu:
     name: PHP images vulnerability scanner
     runs-on: "ubuntu-18.04"
     strategy:
@@ -33,3 +33,50 @@ jobs:
         uses: github/codeql-action/upload-sarif@v1
         with:
           sarif_file: 'trivy-results.sarif'
+
+  alpine:
+    name: PHP images vulnerability scanner
+    runs-on: "ubuntu-18.04"
+    strategy:
+      matrix:
+        php: ["5.6", "7.0", "7.2", "7.3", "7.4", "8.0"]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Run Trivy vulnerability scanner
+        uses: aquasecurity/trivy-action@master
+        with:
+          image-ref: 'docker.io/itkdev/php${{ matrix.php }}-fpm:alpine'
+          format: 'template'
+          template: '@/contrib/sarif.tpl'
+          output: 'trivy-results.sarif'
+          severity: 'MEDIUM,CRITICAL,HIGH'
+          ignore-unfixed: true
+
+      - name: Upload Trivy scan results to GitHub Security tab
+        uses: github/codeql-action/upload-sarif@v1
+        with:
+          sarif_file: 'trivy-results.sarif'
+
+  mariadb:
+    name: MariaDB images vulnerability scanner
+    runs-on: "ubuntu-18.04"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Run Trivy vulnerability scanner
+        uses: aquasecurity/trivy-action@master
+        with:
+          image-ref: 'docker.io/itkdev/mariadb:alpine'
+          format: 'template'
+          template: '@/contrib/sarif.tpl'
+          output: 'trivy-results.sarif'
+          severity: 'MEDIUM,CRITICAL,HIGH'
+          ignore-unfixed: true
+
+      - name: Upload Trivy scan results to GitHub Security tab
+        uses: github/codeql-action/upload-sarif@v1
+        with:
+          sarif_file: 'trivy-results.sarif'

templates/aakbcms/docker-compose.yml

@@ -1,4 +1,4 @@
-# itk-version: 1.0.0
+# itk-version: 1.0.1
 version: "3"
 
 networks:

templates/ddbcms/docker-compose.yml

@@ -1,4 +1,4 @@
-# itk-version: 1.0.0
+# itk-version: 1.0.1
 version: "3"
 
 networks:

templates/drupal-7/docker-compose.yml

@@ -1,4 +1,4 @@
-# itk-version: 1.0.0
+# itk-version: 1.0.1
 version: "3"
 
 networks:

templates/drupal-8/docker-compose.yml

@@ -1,4 +1,4 @@
-# itk-version: 1.0.0
+# itk-version: 1.0.1
 version: "3"
 
 networks:
@@ -80,7 +80,3 @@ services:
       - "traefik.docker.network=frontend"
       - "traefik.http.routers.${COMPOSE_PROJECT_NAME}Mailhog.rule=Host(`mailhog-${COMPOSE_DOMAIN}`)"
       - "traefik.http.services.${COMPOSE_PROJECT_NAME}Mailhog.loadbalancer.server.port=8025"
-
-# Drush cache volume to persist cache between runs.
-volumes:
-  drush-cache:

templates/drupal-9/docker-compose.yml

@@ -1,3 +1,4 @@
+# itk-version: 1.0.1
 version: "3"
 
 networks:
@@ -20,9 +21,6 @@ services:
       - MYSQL_PASSWORD=db
       - MYSQL_DATABASE=db
       #- ENCRYPT=1 # Uncomment to enable database encryption.
-    # @see https://symfony.com/doc/current/setup/symfony_server.html#docker-integration
-    labels:
-      com.symfony.server.service-prefix: 'DATABASE'
 
   phpfpm:
     image: itkdev/php7.4-fpm:latest
@@ -73,10 +71,12 @@ services:
     image: mailhog/mailhog
     networks:
       - app
+      - frontend
     ports:
       - "1025"
       - "8025"
-
-# Drush cache volume to persist cache between runs.
-volumes:
-  drush-cache:
+    labels:
+      - "traefik.enable=true"
+      - "traefik.docker.network=frontend"
+      - "traefik.http.routers.${COMPOSE_PROJECT_NAME}Mailhog.rule=Host(`mailhog-${COMPOSE_DOMAIN}`)"
+      - "traefik.http.services.${COMPOSE_PROJECT_NAME}Mailhog.loadbalancer.server.port=8025"

templates/ereolen/docker-compose.yml

@@ -1,4 +1,4 @@
-# itk-version: 1.0.0
+# itk-version: 1.0.1
 version: "3"
 
 networks:
@@ -85,9 +85,15 @@ services:
     image: mailhog/mailhog
     networks:
       - app
+      - frontend
     ports:
       - "1025"
       - "8025"
+    labels:
+      - "traefik.enable=true"
+      - "traefik.docker.network=frontend"
+      - "traefik.http.routers.${COMPOSE_PROJECT_NAME}Mailhog.rule=Host(`mailhog-${COMPOSE_DOMAIN}`)"
+      - "traefik.http.services.${COMPOSE_PROJECT_NAME}Mailhog.loadbalancer.server.port=8025"
 
   drush:
     image: itkdev/drush6:latest

templates/symfony-3/docker-compose.yml

@@ -1,4 +1,4 @@
-# itk-version: 1.0.0
+# itk-version: 1.0.1
 version: "3"
 
 networks:

templates/symfony-4/docker-compose.yml

@@ -1,4 +1,4 @@
-# itk-version: 1.0.0
+# itk-version: 1.0.1
 version: "3"
 
 networks: