chore: cves (#18)

* chore: cves * f * f * f
replicatedhq · Jun 6, 2023 · 7acdfe3 · 7acdfe3
1 parent 40b1a73
commit 7acdfe3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+bin/
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.15 AS build
+FROM alpine:3.18 AS build
 
 # install kubectl
 RUN apk add curl
@@ -11,13 +11,13 @@ RUN curl -fsSLO "${KUBECTL_URL}" \
 	&& mv kubectl "/usr/local/bin/kubectl-${KUBECTL_VERSION}" \
 	&& ln -s "/usr/local/bin/kubectl-${KUBECTL_VERSION}" /usr/local/bin/kubectl
 
-FROM alpine:3.15
+FROM alpine:3.18
 
-RUN apk add --update --upgrade \
+RUN apk add --update --upgrade --no-cache \
     bash \
 	\
 	\
-	apk-tools \
+	libssl3 \
   && rm -rf /var/cache/apk/*
 
 WORKDIR /home/replicated

diff --git a/Makefile b/Makefile
@@ -23,12 +23,12 @@ endif
 
 .PHONY: build
 build:
-	docker build -t $(IMAGE):$(GIT_SHA) .
+	docker build --pull -t $(IMAGE):$(GIT_SHA) .
 
 .PHONY: scan
 scan:
-	curl -sSfL https://raw.githubusercontent.com/anchore/grype/main/install.sh | sh -s -- -b /usr/local/bin
-	grype --fail-on medium --only-fixed $(IMAGE):$(GIT_SHA)
+	curl -sSfL https://raw.githubusercontent.com/anchore/grype/main/install.sh | sh -s -- -b bin
+	./bin/grype --fail-on medium --only-fixed $(IMAGE):$(GIT_SHA)
 
 .PHONY: push
 push: