From ffd54d2a14841cac06b6006b0c6e0572707ccf70 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 5 Jul 2024 03:28:38 +0000 Subject: [PATCH 01/12] Y --- .github/workflows/image-scan.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/image-scan.yaml b/.github/workflows/image-scan.yaml index dd9a342..68d4386 100644 --- a/.github/workflows/image-scan.yaml +++ b/.github/workflows/image-scan.yaml @@ -18,9 +18,9 @@ jobs: - name: Run Trivy vulnerability scanner uses: aquasecurity/trivy-action@master with: - image-ref: 'ubuntu:impish-20210711' + image-ref: 'mysql:oracle' format: 'table' exit-code: '1' ignore-unfixed: true vuln-type: 'os,library' - severity: 'CRITICAL,HIGH' \ No newline at end of file + severity: 'CRITICAL,HIGH' From 2f138f6ae6be822bc71477d936208834f705cbae Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 5 Jul 2024 03:34:39 +0000 Subject: [PATCH 02/12] Y --- .github/workflows/image-scan.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/image-scan.yaml b/.github/workflows/image-scan.yaml index 68d4386..798482d 100644 --- a/.github/workflows/image-scan.yaml +++ b/.github/workflows/image-scan.yaml @@ -9,7 +9,7 @@ on: jobs: scan: name: Scan Docker Image - runs-on: [runner-2, self-hosted] + #runs-on: [runner-2, self-hosted] steps: - name: Checkout code uses: actions/checkout@v3 From 37e27f6492c6477d450fc89ce7e01a2b9c54257e Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 5 Jul 2024 03:40:23 +0000 Subject: [PATCH 03/12] Y --- .github/workflows/image-scan.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/image-scan.yaml b/.github/workflows/image-scan.yaml index 798482d..e5fe35f 100644 --- a/.github/workflows/image-scan.yaml +++ b/.github/workflows/image-scan.yaml @@ -10,6 +10,7 @@ jobs: scan: name: Scan Docker Image #runs-on: [runner-2, self-hosted] + runs-on:ubuntu:latest steps: - name: Checkout code uses: actions/checkout@v3 From 66b269511fb1061f70700a6d2378ca7f0b311486 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 5 Jul 2024 05:10:44 +0000 Subject: [PATCH 04/12] T --- .github/workflows/image-scan.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/image-scan.yaml b/.github/workflows/image-scan.yaml index e5fe35f..0763851 100644 --- a/.github/workflows/image-scan.yaml +++ b/.github/workflows/image-scan.yaml @@ -10,7 +10,7 @@ jobs: scan: name: Scan Docker Image #runs-on: [runner-2, self-hosted] - runs-on:ubuntu:latest + runs-on:ubuntu-latest steps: - name: Checkout code uses: actions/checkout@v3 From 2fc594e28abfd6c01d062bcb84352ffd6128e9a2 Mon Sep 17 00:00:00 2001 From: deathasaku <38383994+deathasaku@users.noreply.github.com> Date: Fri, 5 Jul 2024 13:13:30 +0800 Subject: [PATCH 05/12] Update image-scan.yaml From b28c8c3307a89ed99f8ac2f2f573a6f86dc8618a Mon Sep 17 00:00:00 2001 From: deathasaku <38383994+deathasaku@users.noreply.github.com> Date: Fri, 5 Jul 2024 13:15:54 +0800 Subject: [PATCH 06/12] Update image-scan.yaml --- .github/workflows/image-scan.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/image-scan.yaml b/.github/workflows/image-scan.yaml index 0763851..f8a7cb2 100644 --- a/.github/workflows/image-scan.yaml +++ b/.github/workflows/image-scan.yaml @@ -10,7 +10,7 @@ jobs: scan: name: Scan Docker Image #runs-on: [runner-2, self-hosted] - runs-on:ubuntu-latest + runs-on: ubuntu-latest steps: - name: Checkout code uses: actions/checkout@v3 From 258eb59e33866103ee170b293e55869bc159db2f Mon Sep 17 00:00:00 2001 From: deathasaku <38383994+deathasaku@users.noreply.github.com> Date: Fri, 5 Jul 2024 13:21:07 +0800 Subject: [PATCH 07/12] Update image-scan.yaml --- .github/workflows/image-scan.yaml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/.github/workflows/image-scan.yaml b/.github/workflows/image-scan.yaml index f8a7cb2..220f31e 100644 --- a/.github/workflows/image-scan.yaml +++ b/.github/workflows/image-scan.yaml @@ -19,7 +19,26 @@ jobs: - name: Run Trivy vulnerability scanner uses: aquasecurity/trivy-action@master with: - image-ref: 'mysql:oracle' + image-ref: 'mysql:latest' + format: 'table' + exit-code: '1' + ignore-unfixed: true + vuln-type: 'os,library' + severity: 'CRITICAL,HIGH' + + - name: Run Trivy vulnerability scanner + uses: aquasecurity/trivy-action@master + with: + image-ref: 'nginx:latest' + format: 'table' + exit-code: '1' + ignore-unfixed: true + vuln-type: 'os,library' + severity: 'CRITICAL,HIGH' + - name: Run Trivy vulnerability scanner + uses: aquasecurity/trivy-action@master + with: + image-ref: 'wordpress:latest' format: 'table' exit-code: '1' ignore-unfixed: true From d7ade0f3ece6995182f57fb10c016a3a21945cb0 Mon Sep 17 00:00:00 2001 From: deathasaku <38383994+deathasaku@users.noreply.github.com> Date: Fri, 5 Jul 2024 13:33:54 +0800 Subject: [PATCH 08/12] Update image-scan.yaml --- .github/workflows/image-scan.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/image-scan.yaml b/.github/workflows/image-scan.yaml index 220f31e..32ca765 100644 --- a/.github/workflows/image-scan.yaml +++ b/.github/workflows/image-scan.yaml @@ -21,7 +21,7 @@ jobs: with: image-ref: 'mysql:latest' format: 'table' - exit-code: '1' + exit-code: '0' ignore-unfixed: true vuln-type: 'os,library' severity: 'CRITICAL,HIGH' From 92df1f9e66e47c2fe005f046b8c7f76ac31f2f20 Mon Sep 17 00:00:00 2001 From: deathasaku <38383994+deathasaku@users.noreply.github.com> Date: Fri, 5 Jul 2024 13:50:55 +0800 Subject: [PATCH 09/12] Update image-scan.yaml --- .github/workflows/image-scan.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/image-scan.yaml b/.github/workflows/image-scan.yaml index 32ca765..17adb13 100644 --- a/.github/workflows/image-scan.yaml +++ b/.github/workflows/image-scan.yaml @@ -9,8 +9,8 @@ on: jobs: scan: name: Scan Docker Image - #runs-on: [runner-2, self-hosted] - runs-on: ubuntu-latest + runs-on: [runner-1, self-hosted] + #runs-on: ubuntu-latest steps: - name: Checkout code uses: actions/checkout@v3 From e668b2cbfad1397dbd59611b1a363e4324d87079 Mon Sep 17 00:00:00 2001 From: deathasaku <38383994+deathasaku@users.noreply.github.com> Date: Fri, 5 Jul 2024 14:00:26 +0800 Subject: [PATCH 10/12] Update image-scan.yaml --- .github/workflows/image-scan.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/image-scan.yaml b/.github/workflows/image-scan.yaml index 17adb13..7f7988d 100644 --- a/.github/workflows/image-scan.yaml +++ b/.github/workflows/image-scan.yaml @@ -31,7 +31,7 @@ jobs: with: image-ref: 'nginx:latest' format: 'table' - exit-code: '1' + exit-code: '0' ignore-unfixed: true vuln-type: 'os,library' severity: 'CRITICAL,HIGH' @@ -40,7 +40,11 @@ jobs: with: image-ref: 'wordpress:latest' format: 'table' - exit-code: '1' + exit-code: '0' ignore-unfixed: true vuln-type: 'os,library' severity: 'CRITICAL,HIGH' + - name: test + run: | + docker ps + shell: bash From 344b9dad899a6428c31718c9cb62c5ff7d698bae Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 5 Jul 2024 06:19:32 +0000 Subject: [PATCH 11/12] 123 --- .cache/ans/single/compose.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.cache/ans/single/compose.yaml b/.cache/ans/single/compose.yaml index babe355..9006256 100644 --- a/.cache/ans/single/compose.yaml +++ b/.cache/ans/single/compose.yaml @@ -1,7 +1,7 @@ services: nginx: image: nginx:latest - container_name: nginx + container_name: nginx_user-12 volumes: - ./nginx.conf:/etc/nginx/nginx.conf:ro ports: @@ -21,7 +21,7 @@ services: wordpress: image: wordpress:latest - container_name: wordpress + container_name: wordpress_user12 environment: WORDPRESS_DB_HOST: db WORDPRESS_DB_USER: exampleuser @@ -43,7 +43,7 @@ services: db: image: mysql:8 - container_name: db + container_name: db_user-12 environment: MYSQL_ROOT_PASSWORD: examplepass MYSQL_DATABASE: exampledb From 8e725dbb7c7998011d020b558b0d06e537998482 Mon Sep 17 00:00:00 2001 From: deathasaku <38383994+deathasaku@users.noreply.github.com> Date: Fri, 5 Jul 2024 14:22:34 +0800 Subject: [PATCH 12/12] Update image-scan.yaml --- .github/workflows/image-scan.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/image-scan.yaml b/.github/workflows/image-scan.yaml index 7f7988d..441aac3 100644 --- a/.github/workflows/image-scan.yaml +++ b/.github/workflows/image-scan.yaml @@ -46,5 +46,6 @@ jobs: severity: 'CRITICAL,HIGH' - name: test run: | - docker ps + cd .cache/ans/single/ + docker compose up -d shell: bash