Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build_ci_multi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
uses: actions/checkout@v3
- run: |
sudo apt-get update
sudo apt-get -y install buildah less git make podman qemu qemu-user-static clamav clamav-freshclam
sudo apt-get -y install qemu-user-static buildah less git make podman clamav clamav-freshclam
name: 'install dev deps'
- run: buildah unshare make branch_or_ref=master release_tag=master multibuild
name: 'build multi image'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_latest_release_multi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
docker login -u ${{secrets.QUAY_USER}} -p ${{secrets.QUAY_TOKEN}} quay.io
- run: |
sudo apt-get update
sudo apt-get -y install buildah less git make podman qemu qemu-user-static clamav clamav-freshclam
sudo apt-get -y install qemu-user-static buildah less git make podman clamav clamav-freshclam
name: 'install dev deps'
- name: Sets env vars
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
docker login -u ${{secrets.QUAY_USER}} -p ${{secrets.QUAY_TOKEN}} quay.io
- run: |
sudo apt-get update
sudo apt-get -y install buildah less git make podman qemu clamav clamav-freshclam
sudo apt-get -y install qemu-user-static buildah less git make podman clamav clamav-freshclam
name: 'install dev deps'
- run: buildah unshare make branch_or_ref=master release_tag=master build_ref_images
name: 'build master images'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_master_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
docker login -u ${{secrets.QUAY_USER}} -p ${{secrets.QUAY_TOKEN}} quay.io
- run: |
sudo apt-get update
sudo apt-get -y install buildah less git make podman qemu clamav clamav-freshclam
sudo apt-get -y install qemu-user-static buildah less git make podman clamav clamav-freshclam
name: 'install dev deps'
- run: buildah unshare make branch_or_ref=master release_tag=master build_debian
name: 'build debian dev image'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_master_multi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
docker login -u ${{secrets.QUAY_USER}} -p ${{secrets.QUAY_TOKEN}} quay.io
- run: |
sudo apt-get update
sudo apt-get -y install buildah less git make podman qemu qemu-user-static clamav clamav-freshclam
sudo apt-get -y install qemu-user-static buildah less git make podman clamav clamav-freshclam
name: 'install dev deps'
- run: buildah unshare make branch_or_ref=master release_tag=master multibuild
name: 'build multi image'
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

## [8.12.0] - 2025-05-02
### Changed
- bump to curl 8.12.0
- bump to alpine:3.21.2

## [8.11.1] - 2024-12-11
### Changed
- bump to curl 8.11.1
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ container_ids=`buildah ls --format "{{.ContainerID}}"`
# default setttings for official curl images
debian_base=docker.io/debian
fedora_base=docker.io/fedora
base=docker.io/alpine:3.21.0
base=docker.io/alpine:3.21.2
arch=""
compiler="gcc"
build_opts=" --enable-static --disable-ldap --enable-ipv6 --enable-unix-sockets -with-ssl --with-libssh2 --with-nghttp2=/usr --with-gssapi"
Expand Down Expand Up @@ -37,7 +37,7 @@ build_fedora:
# > make branch_or_ref=master release_tag=master run_tests=1 build_arm64
#
build_arm64:
./create_dev_image.sh "linux/arm" ${base} ${compiler} ${dev_deps} ${build_opts} ${branch_or_ref} curl-dev-linux-arm64:${release_tag} ${run_tests}
./create_dev_image.sh "arm64" ${base} ${compiler} ${dev_deps} ${build_opts} ${branch_or_ref} curl-dev-linux-arm64:${release_tag} ${run_tests}
# ./create_base_image.sh "linux/arm64" ${base} localhost/curl-dev-linux-arm64:${release_tag} ${base_deps} curl-base-linux-arm64:${release_tag} ${release_tag}
# ./create_appliance_image.sh "linux/arm64" localhost/curl-base-linux-arm64:${release_tag} curl-linux-arm64:${release_tag} ${release_tag}

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.11.1
8.12.0
Loading