Skip to content
This repository has been archived by the owner on Jun 6, 2023. It is now read-only.

Commit

Permalink
bump to 7.75.0, bump alpine 3.12.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@xquery
xquery committed Feb 3, 2021
1 parent 5960413 commit 7d50234
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 18 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# set options
#***************************************************************************

export LATEST_RELEASE_VERSION=7_74_0
export LATEST_RELEASE_VERSION=7_75_0
export LATEST_RELEASE_TAG=curl-${LATEST_RELEASE_VERSION}
export DOCKER_CLI_EXPERIMENTAL=enabled

Expand Down
20 changes: 9 additions & 11 deletions alpine/latest/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#
# SPDX-License-Identifier: MIT
#
# pinning builder image to Alpine 3.11.5
# pinning builder image to Alpine 3.12.3
###############################################################
FROM registry.hub.docker.com/library/alpine:3.11.5 AS builder
FROM registry.hub.docker.com/library/alpine:3.12.3 AS builder

###############################################################
# set build args
Expand All @@ -22,12 +22,12 @@ ARG LABEL_DESC=curl
# build curl
###############################################################
# install deps and use latest curl release source
RUN apk --update add libssh2 libssh2-dev libssh2-static \
RUN apk add libssh2 libssh2-dev libssh2-static \
autoconf automake build-base \
groff openssl curl-dev \
python3 python3-dev \
libtool curl stunnel perl \
nghttp2
nghttp2 brotli brotli-dev

RUN mkdir /src
COPY "curl" "/src/curl"
Expand All @@ -36,7 +36,7 @@ WORKDIR /src/curl
###############################################################
# get ca cert bundle from curl.haxx.se
###############################################################
RUN curl https://curl.haxx.se/ca/cacert.pem -o /cacert.pem
RUN curl https://curl.haxx.se/ca/cacert.pem -L -o /cacert.pem

###############################################################
# build the tag version
Expand All @@ -49,9 +49,9 @@ RUN ./buildconf && \
make DESTDIR="/alpine/" install -j$(nproc)

###############################################################
# pinning image to Alpine 3.11.5
# pinning image to Alpine 3.12.3
###############################################################
FROM registry.hub.docker.com/library/alpine:3.11.5
FROM registry.hub.docker.com/library/alpine:3.12.3

ARG CURL_RELEASE_TAG=latest
ARG CURL_RELEASE_VERSION
Expand All @@ -67,14 +67,12 @@ ENV CURL_GIT_REPO ${CURL_GIT_REPO}
LABEL Maintainer="James Fuller <[email protected]>"
LABEL Name="curl"
LABEL Version="${LABEL_VERSION}"
LABEL docker.cmd="docker run -it curl/curl:7.74.0 -s -L http://curl.haxx.se"
LABEL docker.cmd="docker run -it curl/curl:7.75.0 -s -L http://curl.haxx.se"

###############################################################
# dependencies
###############################################################
RUN apk update --no-cache && \
apk upgrade --no-cache && \
apk add --update --no-cache libssh2 nghttp2-dev && \
RUN apk add --no-cache brotli brotli-dev libssh2 nghttp2-dev && \
rm -fr /var/cache/apk/*

###############################################################
Expand Down
8 changes: 4 additions & 4 deletions alpine/latest/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.74.0" --platform=${DOCKER_MULTI_ARCH} -f Dockerfile . --push
docker buildx imagetools create docker.io/curlimages/curl:7.74.0 --tag curlimages/curl:latest
docker buildx build ${DOCKER_BUILD_OPTS} ${DOCKER_BUILD_ARGS} -t "curlimages/curl:7.75.0" --platform=${DOCKER_MULTI_ARCH} -f Dockerfile . --push
docker buildx imagetools create docker.io/curlimages/curl:7.75.0 --tag curlimages/curl:latest

lint:
docker run --rm --privileged -v ${PWD}:/root/ projectatomic/dockerfile-lint dockerfile_lint -p -f Dockerfile
Expand All @@ -16,8 +16,8 @@ test:
docker run --rm -it curl/curl:${LATEST_RELEASE_VERSION} -S http://httpbin.org/get

push-registry:
docker tag curl/curl:${LATEST_RELEASE_VERSION} curlimages/curl:7.74.0
docker push curlimages/curl:7.74.0
docker tag curl/curl:${LATEST_RELEASE_VERSION} curlimages/curl:7.75.0
docker push curlimages/curl:7.75.0
docker tag curl/curl:${LATEST_RELEASE_VERSION} curlimages/curl:latest
docker push curlimages/curl:latest

Expand Down
4 changes: 2 additions & 2 deletions alpine/latest/scanDockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# image for scanning
###############################################################
FROM curl/curl:7_74_0
FROM curl/curl:7_75_0

USER root

Expand All @@ -20,7 +20,7 @@ RUN apk update
RUN apk add bash build-base clamav clamav-dev cvechecker unrar 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 -L -o rkhunter-1.4.6.tar.gz
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
RUN gzip -d /rkhunter-1.4.6.tar.gz
RUN tar -xvf /rkhunter-1.4.6.tar
RUN cd /rkhunter-1.4.6 && ./installer.sh --install
Expand Down

0 comments on commit 7d50234

Please sign in to comment.