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

Commit

Permalink
bump curl 7.79.1, bump to alpine 3.14.2
Browse files Browse the repository at this point in the history
  • Loading branch information
xquery committed Sep 22, 2021
1 parent a7f0088 commit 74d8bde
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# set options
#***************************************************************************

export LATEST_RELEASE_VERSION=7_78_0
export LATEST_RELEASE_VERSION=7_79_1
export LATEST_RELEASE_TAG=curl-${LATEST_RELEASE_VERSION}
export DOCKER_CLI_EXPERIMENTAL=enabled

Expand Down
8 changes: 4 additions & 4 deletions alpine/latest/Dockerfile
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.14.0
# pinning builder image to Alpine 3.14.2
###############################################################
FROM registry.hub.docker.com/library/alpine:3.14.0 AS builder
FROM registry.hub.docker.com/library/alpine:3.14.2 AS builder

###############################################################
# set build args
Expand Down Expand Up @@ -49,9 +49,9 @@ RUN ./buildconf && \
make DESTDIR="/alpine/" install -j$(nproc)

###############################################################
# pinning image to Alpine 3.14.0
# pinning image to Alpine 3.14.2
###############################################################
FROM registry.hub.docker.com/library/alpine:3.14.0
FROM registry.hub.docker.com/library/alpine:3.14.2

ARG CURL_RELEASE_TAG=latest
ARG CURL_RELEASE_VERSION
Expand Down
8 changes: 4 additions & 4 deletions alpine/latest/Makefile
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.78.0" --platform=${DOCKER_MULTI_ARCH} -f Dockerfile . --push
docker buildx imagetools create docker.io/curlimages/curl:7.78.0 --tag curlimages/curl:latest
docker buildx build ${DOCKER_BUILD_OPTS} ${DOCKER_BUILD_ARGS} -t "curlimages/curl:7.79.1" --platform=${DOCKER_MULTI_ARCH} -f Dockerfile . --push
docker buildx imagetools create docker.io/curlimages/curl:7.79.1 --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 curl/curl:${LATEST_RELEASE_VERSION} -S http://httpbin.org/get

push-registry:
docker tag curl/curl:${LATEST_RELEASE_VERSION} curlimages/curl:7.78.0
docker push curlimages/curl:7.78.0
docker tag curl/curl:${LATEST_RELEASE_VERSION} curlimages/curl:7.79.1
docker push curlimages/curl:7.79.1
docker tag curl/curl:${LATEST_RELEASE_VERSION} curlimages/curl:latest
docker push curlimages/curl:latest

Expand Down
2 changes: 1 addition & 1 deletion alpine/latest/scanDockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# image for scanning
###############################################################
FROM curl/curl:7_78_0
FROM curl/curl:7_79_1

USER root

Expand Down

0 comments on commit 74d8bde

Please sign in to comment.