From 9e787bfacbf3fce6b047eaf8d22609a019629963 Mon Sep 17 00:00:00 2001
From: Luther Monson <luther.monson@gmail.com>
Date: Tue, 5 Oct 2021 16:05:56 -0700
Subject: [PATCH] moving fossa to being inline step with a sles image

Signed-off-by: Luther Monson <luther.monson@gmail.com>
---
 .drone.yml        | 10 +++++-----
 Dockerfile.dapper |  3 +--
 scripts/fossa.sh  |  5 -----
 3 files changed, 6 insertions(+), 12 deletions(-)
 delete mode 100755 scripts/fossa.sh

diff --git a/.drone.yml b/.drone.yml
index 922e9bda183..4783e229a1f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -23,16 +23,16 @@ steps:
     path: /var/run/docker.sock
 
 - name: fossa
-  image: rancher/dapper:v0.5.4
+  image: registry.suse.com/suse/sle15:15.3.17.8.1
   failure: ignore
   environment:
     FOSSA_API_KEY:
       from_secret: FOSSA_API_KEY
   commands:
-    - dapper fossa
-  volumes:
-    - name: docker
-      path: /var/run/docker.sock
+    - zypper -n install curl unzip
+    - "curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/spectrometer/master/install.sh | sh"
+    - fossa analyze
+    - fossa test
   when:
     instance:
       - drone-publish.k3s.io
diff --git a/Dockerfile.dapper b/Dockerfile.dapper
index e29505ab7f2..e2347c09f9e 100644
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -31,7 +31,6 @@ RUN rm -rf /go/src /go/pkg
 
 RUN if [ "$(go env GOARCH)" = "amd64" ]; then \
     curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.41.1; \
-    curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/spectrometer/master/install.sh | sh; \
     fi
 
 ENV YQ_URL=https://github.com/mikefarah/yq/releases/download/v4.6.2/yq_linux
@@ -42,7 +41,7 @@ ENV SELINUX $SELINUX
 
 ENV GO111MODULE off
 ENV DAPPER_RUN_ARGS --privileged -v k3s-cache:/go/src/github.com/rancher/k3s/.cache -v trivy-cache:/root/.cache/trivy
-ENV DAPPER_ENV REPO TAG DRONE_TAG IMAGE_NAME SKIP_VALIDATE GCLOUD_AUTH GITHUB_TOKEN GOLANG FOSSA_API_KEY
+ENV DAPPER_ENV REPO TAG DRONE_TAG IMAGE_NAME SKIP_VALIDATE GCLOUD_AUTH GITHUB_TOKEN GOLANG
 ENV DAPPER_SOURCE /go/src/github.com/rancher/k3s/
 ENV DAPPER_OUTPUT ./bin ./dist ./build/out
 ENV DAPPER_DOCKER_SOCKET true
diff --git a/scripts/fossa.sh b/scripts/fossa.sh
deleted file mode 100755
index 9b8a22e5f9c..00000000000
--- a/scripts/fossa.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-set -e
-
-fossa analyze
-fossa test