Merge pull request #1409 from kaytu-io/fix-steampipe-upgrade

fix: update steampipe versions
opengovern · Aug 3, 2024 · acc458e · acc458e
2 parents f99211a + cedcd7b
commit acc458e
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 8 deletions.
diff --git a/docker/AnalyticsWorkerDockerfile b/docker/AnalyticsWorkerDockerfile
@@ -4,15 +4,24 @@ FROM ${PLUGIN_REGISTRY}/steampipe-plugin-azure:0.0.1 as azure
 FROM ${PLUGIN_REGISTRY}/steampipe-plugin-azuread:0.0.1 as azuread
 FROM ${PLUGIN_REGISTRY}/steampipe-plugin-kaytu:0.0.1 as kaytu
 
-FROM ghcr.io/turbot/steampipe:0.21.1
+FROM ubuntu:20.04 AS base
+RUN apt-get update && apt-get install -y \
+    curl \
+    sudo \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN sudo /bin/sh -c "$(curl -fsSL https://steampipe.io/install/steampipe.sh)"
 
 COPY --from=aws /steampipe-plugin-aws.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/aws@latest/steampipe-plugin-aws.plugin
 COPY --from=azure /steampipe-plugin-azure.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/azure@latest/steampipe-plugin-azure.plugin
 COPY --from=azuread /steampipe-plugin-azuread.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/azuread@latest/steampipe-plugin-azuread.plugin
 COPY --from=kaytu /steampipe-plugin-kaytu.plugin /home/steampipe/.steampipe/plugins/local/kaytu/kaytu.plugin
 
 USER root
-RUN chown -R steampipe /home/steampipe/.steampipe/plugins/*
+RUN useradd -m -s /bin/bash steampipe
+RUN mkdir -p /home/steampipe/.steampipe/config
+RUN chown -R steampipe:steampipe /home/steampipe
+RUN chmod -R 755 /home/steampipe
 RUN apt update
 RUN apt install -y procps htop
 USER steampipe

diff --git a/docker/ComplianceReportWorkerDockerfile b/docker/ComplianceReportWorkerDockerfile
@@ -4,15 +4,24 @@ FROM ${PLUGIN_REGISTRY}/steampipe-plugin-azure:0.0.1 as azure
 FROM ${PLUGIN_REGISTRY}/steampipe-plugin-azuread:0.0.1 as azuread
 FROM ${PLUGIN_REGISTRY}/steampipe-plugin-kaytu:0.0.1 as kaytu
 
-FROM ghcr.io/turbot/steampipe:0.21.1
+FROM ubuntu:20.04 AS base
+RUN apt-get update && apt-get install -y \
+    curl \
+    sudo \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN sudo /bin/sh -c "$(curl -fsSL https://steampipe.io/install/steampipe.sh)"
 
 COPY --from=aws /steampipe-plugin-aws.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/aws@latest/steampipe-plugin-aws.plugin
 COPY --from=azure /steampipe-plugin-azure.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/azure@latest/steampipe-plugin-azure.plugin
 COPY --from=azuread /steampipe-plugin-azuread.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/azuread@latest/steampipe-plugin-azuread.plugin
 COPY --from=kaytu /steampipe-plugin-kaytu.plugin /home/steampipe/.steampipe/plugins/local/kaytu/kaytu.plugin
 
 USER root
-RUN chown -R steampipe /home/steampipe/.steampipe/plugins/*
+RUN useradd -m -s /bin/bash steampipe
+RUN mkdir -p /home/steampipe/.steampipe/config
+RUN chown -R steampipe:steampipe /home/steampipe
+RUN chmod -R 755 /home/steampipe
 RUN apt update
 RUN apt install -y procps htop
 USER steampipe

diff --git a/docker/InsightWorkerDockerfile b/docker/InsightWorkerDockerfile
@@ -4,15 +4,24 @@ FROM ${PLUGIN_REGISTRY}/steampipe-plugin-azure:0.0.1 as azure
 FROM ${PLUGIN_REGISTRY}/steampipe-plugin-azuread:0.0.1 as azuread
 FROM ${PLUGIN_REGISTRY}/steampipe-plugin-kaytu:0.0.1 as kaytu
 
-FROM ghcr.io/turbot/steampipe:0.21.1
+FROM ubuntu:20.04 AS base
+RUN apt-get update && apt-get install -y \
+    curl \
+    sudo \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN sudo /bin/sh -c "$(curl -fsSL https://steampipe.io/install/steampipe.sh)"
 
 COPY --from=aws /steampipe-plugin-aws.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/aws@latest/steampipe-plugin-aws.plugin
 COPY --from=azure /steampipe-plugin-azure.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/azure@latest/steampipe-plugin-azure.plugin
 COPY --from=azuread /steampipe-plugin-azuread.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/azuread@latest/steampipe-plugin-azuread.plugin
 COPY --from=kaytu /steampipe-plugin-kaytu.plugin /home/steampipe/.steampipe/plugins/local/kaytu/kaytu.plugin
 
 USER root
-RUN chown -R steampipe /home/steampipe/.steampipe/plugins/*
+RUN useradd -m -s /bin/bash steampipe
+RUN mkdir -p /home/steampipe/.steampipe/config
+RUN chown -R steampipe:steampipe /home/steampipe
+RUN chmod -R 755 /home/steampipe
 RUN apt update
 RUN apt install -y procps htop
 USER steampipe

diff --git a/docker/SteampipeServiceDockerfile b/docker/SteampipeServiceDockerfile
@@ -4,15 +4,24 @@ FROM ${PLUGIN_REGISTRY}/steampipe-plugin-azure:0.0.1 as azure
 FROM ${PLUGIN_REGISTRY}/steampipe-plugin-azuread:0.0.1 as azuread
 FROM ${PLUGIN_REGISTRY}/steampipe-plugin-kaytu:0.0.1 as kaytu
 
-FROM ghcr.io/turbot/steampipe:0.21.1
+FROM ubuntu:20.04 AS base
+RUN apt-get update && apt-get install -y \
+    curl \
+    sudo \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN sudo /bin/sh -c "$(curl -fsSL https://steampipe.io/install/steampipe.sh)"
 
 COPY --from=aws /steampipe-plugin-aws.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/aws@latest/steampipe-plugin-aws.plugin
 COPY --from=azure /steampipe-plugin-azure.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/azure@latest/steampipe-plugin-azure.plugin
 COPY --from=azuread /steampipe-plugin-azuread.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/azuread@latest/steampipe-plugin-azuread.plugin
 COPY --from=kaytu /steampipe-plugin-kaytu.plugin /home/steampipe/.steampipe/plugins/local/kaytu/kaytu.plugin
 
 USER root
-RUN chown -R steampipe /home/steampipe/.steampipe/plugins/*
+RUN useradd -m -s /bin/bash steampipe
+RUN mkdir -p /home/steampipe/.steampipe/config
+RUN chown -R steampipe:steampipe /home/steampipe
+RUN chmod -R 755 /home/steampipe
 RUN apt update
 RUN apt install -y procps htop
 USER steampipe
diff --git a/pkg/describe/server.go b/pkg/describe/server.go
@@ -796,6 +796,8 @@ func (h HttpServer) ReEvaluateComplianceJob(ctx echo.Context) error {
 		return err
 	}
 
+	h.Scheduler.logger.Info("re-evaluating compliance job", zap.Any("job_parameters", jobParameters))
+
 	jobParametersJSON, err := json.Marshal(jobParameters)
 	if err != nil {
 		h.Scheduler.logger.Error("failed to marshal job parameters", zap.Error(err))