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

Commit

Permalink
bump 7.73.0
Browse files Browse the repository at this point in the history
  • Loading branch information
xquery committed Oct 14, 2020
1 parent d6525c8 commit c5ac9a6
Show file tree
Hide file tree
Showing 5 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_72_0
export LATEST_RELEASE_VERSION=7_73_0
export LATEST_RELEASE_TAG=curl-${LATEST_RELEASE_VERSION}
export DOCKER_CLI_EXPERIMENTAL=enabled

Expand Down
6 changes: 3 additions & 3 deletions alpine/latest/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ ENV CURL_GIT_REPO ${CURL_GIT_REPO}
LABEL Maintainer="James Fuller <jim.fuller@webcomposite.com>"
LABEL Name="curl"
LABEL Version="${LABEL_VERSION}"
LABEL docker.cmd="docker run -it curl/curl:7.72.0 -s -L http://curl.haxx.se"
LABEL docker.cmd="docker run -it curl/curl:7.73.0 -s -L http://curl.haxx.se"

###############################################################
# dependencies
Expand All @@ -91,11 +91,11 @@ ENV CURL_CA_BUNDLE="/cacert.pem"
###############################################################
# install curl built from builder
###############################################################
COPY --from=builder "/alpine/usr/local/lib/libcurl.so.4.6.0" "/usr/lib/"
COPY --from=builder "/alpine/usr/local/lib/libcurl.so.4.7.0" "/usr/lib/"
COPY --from=builder "/alpine/usr/local/bin/curl" "/usr/bin/curl"

# explicitly set symlinks
RUN ln -s /usr/lib/libcurl.so.4.6.0 /usr/lib/libcurl.so.4
RUN ln -s /usr/lib/libcurl.so.4.7.0 /usr/lib/libcurl.so.4
RUN ln -s /usr/lib/libcurl.so.4 /usr/lib/libcurl.so

###############################################################
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.72.0" --platform=${DOCKER_MULTI_ARCH} -f Dockerfile . --push
docker buildx imagetools create docker.io/curlimages/curl:7.72.0 --tag curlimages/curl:latest
docker buildx build ${DOCKER_BUILD_OPTS} ${DOCKER_BUILD_ARGS} -t "curlimages/curl:7.73.0" --platform=${DOCKER_MULTI_ARCH} -f Dockerfile . --push
docker buildx imagetools create docker.io/curlimages/curl:7.73.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.72.0
docker push curlimages/curl:7.72.0
docker tag curl/curl:${LATEST_RELEASE_VERSION} curlimages/curl:7.73.0
docker push curlimages/curl:7.73.0
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_71_1
FROM curl/curl:7_73_0

USER root

Expand Down
2 changes: 1 addition & 1 deletion alpine/latest/test-container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ fileExistenceTests:
shouldExist: true
isExecutableBy: 'owner'
- name: 'built_curl_library'
path: '/usr/lib/libcurl.so.4.6.0'
path: '/usr/lib/libcurl.so.4.7.0'
shouldExist: true
- name: 'built_curl_library_ls1'
path: '/usr/lib/libcurl.so.4'
Expand Down

0 comments on commit c5ac9a6

Please sign in to comment.