github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #8021 from AkihiroSuda/release-ubuntu-20.04

Browse Source 
Fix https://github.com/containerd/containerd/issues/7961
This commit is contained in:
Samuel Karp 2023-01-28 23:45:15 -08:00 committed by GitHub
commit fbf145b312
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.github/workflows/release.yml vendored
View File

@ -69,19 +69,20 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
# Choose an old release of Ubuntu to avoid glibc issue https://github.com/containerd/containerd/issues/7255 # Ubuntu 22.04 can't be used until we drop support for binary compatibility with dynamically-linked glibc 2.17 (CentOS 7).
- dockerfile-ubuntu: 18.04 # https://github.com/containerd/containerd/issues/7255
# https://github.com/containerd/containerd/issues/7961
- dockerfile-ubuntu: 20.04
dockerfile-platform: linux/amd64 dockerfile-platform: linux/amd64
- dockerfile-ubuntu: 18.04 - dockerfile-ubuntu: 20.04
dockerfile-platform: linux/arm64 dockerfile-platform: linux/arm64
- dockerfile-ubuntu: 18.04 - dockerfile-ubuntu: 20.04
dockerfile-platform: linux/ppc64le dockerfile-platform: linux/ppc64le
- dockerfile-ubuntu: 18.04 - dockerfile-ubuntu: 20.04
dockerfile-platform: linux/s390x dockerfile-platform: linux/s390x
# riscv64 isn't supported by Ubuntu 18.04 - dockerfile-ubuntu: 20.04
- dockerfile-ubuntu: 22.04
dockerfile-platform: linux/riscv64 dockerfile-platform: linux/riscv64
- dockerfile-ubuntu: 18.04 - dockerfile-ubuntu: 20.04
dockerfile-platform: windows/amd64 dockerfile-platform: windows/amd64
steps: steps:
- name: Set RELEASE_VER - name: Set RELEASE_VER

4
.github/workflows/release/Dockerfile vendored
View File

@ -12,8 +12,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# UBUNTU_VERSION can be set to 18.04 (bionic), 20.04 (focal), or 22.04 (jammy) # UBUNTU_VERSION can be set to 18.04 (bionic, DEPRECATED), 20.04 (focal), or 22.04 (jammy)
ARG UBUNTU_VERSION=18.04 ARG UBUNTU_VERSION=20.04
ARG BASE_IMAGE=ubuntu:${UBUNTU_VERSION} ARG BASE_IMAGE=ubuntu:${UBUNTU_VERSION}
ARG GO_VERSION ARG GO_VERSION
ARG GO_IMAGE=golang:${GO_VERSION} ARG GO_IMAGE=golang:${GO_VERSION}

2
releases/v1.7.0-beta.toml
View File

@ -119,7 +119,7 @@ See the changelog for complete list of changes"""
postface = """\ postface = """\
### Which file should I download? ### Which file should I download?
* `containerd-<VERSION>-<OS>-<ARCH>.tar.gz`: ✅Recommended. Dynamically linked with glibc 2.27 (Ubuntu 18.04). * `containerd-<VERSION>-<OS>-<ARCH>.tar.gz`: ✅Recommended. Dynamically linked with glibc 2.31 (Ubuntu 20.04).
* `containerd-static-<VERSION>-<OS>-<ARCH>.tar.gz`: Statically linked. Expected to be used on non-glibc Linux distributions. Not position-independent. * `containerd-static-<VERSION>-<OS>-<ARCH>.tar.gz`: Statically linked. Expected to be used on non-glibc Linux distributions. Not position-independent.
* `cri-containerd-<VERSION>-<OS>-<ARCH>.tar.gz`: (Deprecated) * `cri-containerd-<VERSION>-<OS>-<ARCH>.tar.gz`: (Deprecated)
* `cri-containerd-cni-<VERSION>-<OS>-<ARCH>.tar.gz`: (Deprecated) * `cri-containerd-cni-<VERSION>-<OS>-<ARCH>.tar.gz`: (Deprecated)