bumping curl 7.81.0, bumping to alpine 3.15.0, added grype scanning

curl · Jan 5, 2022 · fa50613 · fa50613
1 parent 6dab571
commit fa50613
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 # set options
 #***************************************************************************
 
-export LATEST_RELEASE_VERSION=7_80_0
+export LATEST_RELEASE_VERSION=7_81_0
 export LATEST_RELEASE_TAG=curl-${LATEST_RELEASE_VERSION}
 export DOCKER_CLI_EXPERIMENTAL=enabled
 

diff --git a/alpine/latest/Dockerfile b/alpine/latest/Dockerfile
@@ -4,9 +4,9 @@
 #
 # SPDX-License-Identifier: MIT
 #
-# pinning builder image to Alpine 3.14.2
+# pinning builder image to Alpine 3.15.0
 ###############################################################
-FROM registry.hub.docker.com/library/alpine:3.14.2 AS builder
+FROM registry.hub.docker.com/library/alpine:3.15.0 AS builder
 
 ###############################################################
 # set build args
@@ -49,9 +49,9 @@ RUN ./buildconf && \
     make DESTDIR="/alpine/" install  -j$(nproc)
 
 ###############################################################
-# pinning image to Alpine 3.14.2
+# pinning image to Alpine 3.15.0
 ###############################################################
-FROM registry.hub.docker.com/library/alpine:3.14.2
+FROM registry.hub.docker.com/library/alpine:3.15.0
 
 ARG CURL_RELEASE_TAG=latest
 ARG CURL_RELEASE_VERSION

diff --git a/alpine/latest/Makefile b/alpine/latest/Makefile
@@ -5,8 +5,8 @@ buildtest:
 	docker build ${DOCKER_BUILD_OPTS} ${DOCKER_BUILD_ARGS} -t "curl/curl:scan-test" -f scanDockerfile .
 
 multibuild:
-	docker buildx build ${DOCKER_BUILD_OPTS} ${DOCKER_BUILD_ARGS} -t "curlimages/curl:7.80.0" --platform=${DOCKER_MULTI_ARCH} -f Dockerfile . --push
-	docker buildx imagetools create docker.io/curlimages/curl:7.80.0 --tag curlimages/curl:latest
+	docker buildx build ${DOCKER_BUILD_OPTS} ${DOCKER_BUILD_ARGS} -t "curlimages/curl:7.81.0" --platform=${DOCKER_MULTI_ARCH} -f Dockerfile . --push
+	docker buildx imagetools create docker.io/curlimages/curl:7.81.0 --tag curlimages/curl:latest
 
 lint:
 	docker run --rm --privileged -v ${PWD}:/root/ projectatomic/dockerfile-lint dockerfile_lint -p -f Dockerfile
@@ -16,8 +16,8 @@ test:
 	docker run --rm curl/curl:${LATEST_RELEASE_VERSION} -S http://httpbin.org/get
 
 push-registry:
-	docker tag curl/curl:${LATEST_RELEASE_VERSION} curlimages/curl:7.80.0
-	docker push curlimages/curl:7.80.0
+	docker tag curl/curl:${LATEST_RELEASE_VERSION} curlimages/curl:7.81.0
+	docker push curlimages/curl:7.81.0
 	docker tag curl/curl:${LATEST_RELEASE_VERSION} curlimages/curl:latest
 	docker push curlimages/curl:latest
 
@@ -26,7 +26,7 @@ scan: buildtest
 	docker run --rm -it curl/curl:scan-test clamscan -r -i --exclude-dir=^/sys || true
 	docker run --rm -it curl/curl:scan-test lynis audit system
 	docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v /tmp:/root/.cache/ aquasec/trivy curl/curl:${LATEST_RELEASE_VERSION}
-	curl -s https://ci-tools.anchore.io/inline_scan-v0.6.1 | bash -s -- -p -r "curl/curl:${LATEST_RELEASE_VERSION}"
+	curl -sSfL https://raw.githubusercontent.com/anchore/grype/main/install.sh | sh -s -- -b /usr/local/bin && grype curl/curl:${LATEST_RELEASE_VERSION}
 
 clean:
 	rm -Rf curl

diff --git a/alpine/latest/scanDockerfile b/alpine/latest/scanDockerfile
@@ -6,7 +6,7 @@
 #
 # image for scanning
 ###############################################################
-FROM curl/curl:7_80_0
+FROM curl/curl:7_81_0
 
 USER root
 
@@ -17,7 +17,7 @@ RUN \
 
 RUN apk update
 
-RUN apk add bash build-base clamav clamav-dev cvechecker unrar linux-headers
+RUN apk add bash build-base clamav cvechecker linux-headers
 RUN apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing lynis
 
 RUN curl https://sourceforge.net/projects/rkhunter/files/rkhunter/1.4.6/rkhunter-1.4.6.tar.gz/download -v -L -o rkhunter-1.4.6.tar.gz