diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 997205c7..1e7d200f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -62,7 +62,6 @@ jobs: mongo-utils: ${{ steps.filter.outputs.mongo-utils }} litmusctl: ${{ steps.filter.outputs.litmusctl }} litmus-redis-load: ${{ steps.filter.outputs.litmus-redis-load }} - litmus-snyk-image: ${{ steps.filter.outputs.litmus-snyk-image }} litmus-helm-agent: ${{ steps.filter.outputs.litmus-helm-agent }} steps: - uses: actions/checkout@v2 @@ -142,8 +141,6 @@ jobs: - 'custom/litmusctl/**' litmus-redis-load: - 'custom/workflow-helper/redis-helper/load-gen/**' - litmus-snyk-image: - - 'custom/security/snyk/**' litmus-helm-agent: - 'custom/litmus-helm-agent/**' @@ -257,17 +254,6 @@ jobs: - name: Building cassandra-client image run: make cassandra-client - litmus-snyk-image: - runs-on: ubuntu-latest - needs: changes - if: needs.changes.outputs.litmus-snyk-image == 'true' - steps: - - uses: actions/checkout@v2 - with: - ref: ${{ github.event.pull_request.head.sha }} - - name: Building litmus-snyk-image image - run: make litmus-snyk-image - litmus-argocli: runs-on: ubuntu-latest needs: changes diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 37a2b3c4..09a15c54 100755 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -65,7 +65,6 @@ jobs: mongo-utils: ${{ steps.filter.outputs.mongo-utils }} litmusctl: ${{ steps.filter.outputs.litmusctl }} litmus-redis-load: ${{ steps.filter.outputs.litmus-redis-load }} - litmus-snyk-image: ${{ steps.filter.outputs.litmus-snyk-image }} litmus-helm-agent: ${{ steps.filter.outputs.litmus-helm-agent }} steps: @@ -150,8 +149,6 @@ jobs: - 'custom/litmusctl/**' litmus-redis-load: - 'custom/workflow-helper/redis-helper/load-gen/**' - litmus-snyk-image: - - 'custom/security/snyk/**' litmus-helm-agent: - 'custom/litmus-helm-agent/**' @@ -262,16 +259,7 @@ jobs: run: | make docker.buildx make _push_litmus_git_app_checker - - litmus-snyk-image: - runs-on: ubuntu-latest - needs: changes - if: needs.changes.outputs.litmus-snyk-image == 'true' - steps: - - uses: actions/checkout@v2 - - name: Building litmus-snyk-image image - run: make litmus-snyk-image - + litmus-k8s: runs-on: ubuntu-latest needs: changes diff --git a/Makefile b/Makefile index 4475f742..2b6aef97 100755 --- a/Makefile +++ b/Makefile @@ -425,16 +425,6 @@ _push_litmus_redis_load: litmus-redis-load: deps _build_litmus_redis_load _push_litmus_redis_load -_build_litmus_snyk: - @echo "INFO: Building container image for litmuschaos/snyk" - cd custom/security/snyk/ && docker build -t litmuschaos/snyk:1.0 . - -_push_litmus_snyk: - @echo "INFO: Publish container litmuschaos/litmuschaos/snyk" - cd custom/security/snyk/ && ./buildscripts/push - -litmus-snyk-image: deps _build_litmus_snyk _push_litmus_snyk - PHONY: go-build go-build: experiment-go-binary @@ -465,5 +455,3 @@ _build_litmus_helm_agent: _push_litmus_helm_agent: @echo "INFO: Publish container litmuschaos/litmus-helm-agent" cd custom/litmus-helm-agent/ && ./buildscripts/push - -litmus-snyk-image: deps _build_litmus_snyk _push_litmus_snyk \ No newline at end of file diff --git a/custom/security/snyk/Dockerfile b/custom/security/snyk/Dockerfile deleted file mode 100644 index a0b4abfc..00000000 --- a/custom/security/snyk/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM snyk/snyk:linux - -RUN apt-get update && \ - apt-get -y install sudo wget && \ - apt-get install -y python3-pip - -RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo - -CMD /bin/bash - diff --git a/custom/security/snyk/buildscripts/push b/custom/security/snyk/buildscripts/push deleted file mode 100755 index afb1fff1..00000000 --- a/custom/security/snyk/buildscripts/push +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -set -e - -IMAGEID=$( docker images -q litmuschaos/snyk ) - -if [ ! -z "${DNAME}" ] && [ ! -z "${DPASS}" ]; -then - docker login -u "${DNAME}" -p "${DPASS}"; - #Push to docker hub repository with latest tag - docker tag ${IMAGEID} litmuschaos/snyk:1.0 - docker push litmuschaos/snyk:1.0; -else - echo "No docker credentials provided. Skip uploading litmuschaos/snyk:1.0 to docker hub"; -fi;