Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

apparmor: fix parsing beta/alpha version #1689

Merged
merged 1 commit into from
Oct 6, 2023
Merged

apparmor: fix parsing beta/alpha version #1689

merged 1 commit into from
Oct 6, 2023

Conversation

vrothberg
Copy link
Member

Copied from github.com/moby/moby who already has a fix for it. Tested manually on a Ubuntu 23.10 (beta) VM.

Fixes: #containers/podman/issues/20278

@vrothberg
apparmor: fix parsing beta/alpha version
5c81adc 
Copied from github.com/moby/moby who already has a fix for it.
Tested manually on a Ubuntu 23.10 (beta) VM.

Fixes: #containers/podman/issues/20278
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
@vrothberg vrothberg marked this pull request as ready for review October 6, 2023 09:42
@vrothberg
Copy link
Member Author

@Luap99 @flouthoc PTAL

Luap99
Luap99 approved these changes Oct 6, 2023
View reviewed changes
Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

flouthoc
flouthoc approved these changes Oct 6, 2023
View reviewed changes
Copy link
Collaborator

@flouthoc flouthoc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm label Oct 6, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 6, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: flouthoc, Luap99, vrothberg

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot merged commit f2d1b14 into containers:main Oct 6, 2023
7 checks passed
@vrothberg vrothberg deleted the fix-aa branch October 6, 2023 10:53
@vrothberg vrothberg mentioned this pull request Oct 6, 2023
Closed
hswong3i added a commit to alvistack/cri-o-cri-o that referenced this pull request Nov 19, 2023
@hswong3i
alvistack/v1.28.2
8c3347e 
    git clean -xdf
    go mod download
    go mod vendor
    tar zcvf ../cri-o_1.28.2.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp cri-o.spec ../cri-o_1.28.2-1.spec
    cp ../cri-o*1.28.2*.{gz,xz,spec,dsc} /osc/home\:alvistack/cri-o-cri-o-1.28.2/
    rm -rf ../cri-o*1.28.2*.*

See containers/common#1689

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
hswong3i added a commit to alvistack/cri-o-cri-o that referenced this pull request Nov 19, 2023
@hswong3i
alvistack/v1.27.1
2a54823 
    git clean -xdf
    go mod download
    go mod vendor
    tar zcvf ../cri-o_1.27.1.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp cri-o.spec ../cri-o_1.27.1-1.spec
    cp ../cri-o*1.27.1*.{gz,xz,spec,dsc} /osc/home\:alvistack/cri-o-cri-o-1.27.1/
    rm -rf ../cri-o*1.27.1*.*

See containers/common#1689

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
hswong3i added a commit to alvistack/cri-o-cri-o that referenced this pull request Nov 19, 2023
@hswong3i
alvistack/v1.26.4
261be81 
    git clean -xdf
    go mod download
    go mod vendor
    tar zcvf ../cri-o_1.26.4.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp cri-o.spec ../cri-o_1.26.4-1.spec
    cp ../cri-o*1.26.4*.{gz,xz,spec,dsc} /osc/home\:alvistack/cri-o-cri-o-1.26.4/
    rm -rf ../cri-o*1.26.4*.*

See containers/common#1689

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
hswong3i added a commit to alvistack/cri-o-cri-o that referenced this pull request Nov 19, 2023
@hswong3i
alvistack/v1.28.2
e57ee35 
    git clean -xdf
    go mod download
    go mod vendor
    tar zcvf ../cri-o_1.28.2.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp cri-o.spec ../cri-o_1.28.2-1.spec
    cp ../cri-o*1.28.2*.{gz,xz,spec,dsc} /osc/home\:alvistack/cri-o-cri-o-1.28.2/
    rm -rf ../cri-o*1.28.2*.*

See containers/common#1689

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
hswong3i added a commit to alvistack/cri-o-cri-o that referenced this pull request Nov 19, 2023
@hswong3i
alvistack/v1.26.4
d8cbd27 
    git clean -xdf
    go mod download
    go mod vendor
    curl -skL https://github.com/containers/common/commit/f2d1b1442077c26c800106219e9e9b2f3838e08b.patch | patch -p1 -d vendor/github.com/containers/common/
    tar zcvf ../cri-o_1.26.4.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp cri-o.spec ../cri-o_1.26.4-1.spec
    cp ../cri-o*1.26.4*.{gz,xz,spec,dsc} /osc/home\:alvistack/cri-o-cri-o-1.26.4/
    rm -rf ../cri-o*1.26.4*.*

See containers/common#1689

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
hswong3i added a commit to alvistack/cri-o-cri-o that referenced this pull request Nov 19, 2023
@hswong3i
alvistack/v1.27.1
6114f5e 
    git clean -xdf
    go mod download
    go mod vendor
    curl -skL https://github.com/containers/common/commit/f2d1b1442077c26c800106219e9e9b2f3838e08b.patch | patch -p1 -d vendor/github.com/containers/common/
    tar zcvf ../cri-o_1.27.1.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp cri-o.spec ../cri-o_1.27.1-1.spec
    cp ../cri-o*1.27.1*.{gz,xz,spec,dsc} /osc/home\:alvistack/cri-o-cri-o-1.27.1/
    rm -rf ../cri-o*1.27.1*.*

See containers/common#1689

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
hswong3i added a commit to alvistack/cri-o-cri-o that referenced this pull request Nov 19, 2023
@hswong3i
alvistack/v1.28.2
3a78b98 
    git clean -xdf
    go mod download
    go mod vendor
    curl -skL https://github.com/containers/common/commit/f2d1b1442077c26c800106219e9e9b2f3838e08b.patch | patch -p1 -d vendor/github.com/containers/common/
    tar zcvf ../cri-o_1.28.2.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp cri-o.spec ../cri-o_1.28.2-1.spec
    cp ../cri-o*1.28.2*.{gz,xz,spec,dsc} /osc/home\:alvistack/cri-o-cri-o-1.28.2/
    rm -rf ../cri-o*1.28.2*.*

See containers/common#1689

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
@hswong3i hswong3i mentioned this pull request Nov 19, 2023
Closed
hswong3i added a commit to alvistack/cri-o-cri-o that referenced this pull request Nov 19, 2023
@hswong3i
alvistack/v1.26.4
e7cf410 
    git clean -xdf
    go mod download
    go mod vendor
    curl -skL https://github.com/containers/common/commit/f2d1b1442077c26c800106219e9e9b2f3838e08b.patch | patch -p1 -d vendor/github.com/containers/common/
    tar zcvf ../cri-o_1.26.4.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp cri-o.spec ../cri-o_1.26.4-1.spec
    cp ../cri-o*1.26.4*.{gz,xz,spec,dsc} /osc/home\:alvistack/cri-o-cri-o-1.26.4/
    rm -rf ../cri-o*1.26.4*.*

See containers/common#1689
See cri-o#7490

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
hswong3i added a commit to alvistack/cri-o-cri-o that referenced this pull request Nov 19, 2023
@hswong3i
alvistack/v1.27.1
9a5e34b 
    git clean -xdf
    go mod download
    go mod vendor
    curl -skL https://github.com/containers/common/commit/f2d1b1442077c26c800106219e9e9b2f3838e08b.patch | patch -p1 -d vendor/github.com/containers/common/
    tar zcvf ../cri-o_1.27.1.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp cri-o.spec ../cri-o_1.27.1-1.spec
    cp ../cri-o*1.27.1*.{gz,xz,spec,dsc} /osc/home\:alvistack/cri-o-cri-o-1.27.1/
    rm -rf ../cri-o*1.27.1*.*

See containers/common#1689
See cri-o#7490

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
hswong3i added a commit to alvistack/cri-o-cri-o that referenced this pull request Nov 19, 2023
@hswong3i
alvistack/v1.28.2
666e3b3 
    git clean -xdf
    go mod download
    go mod vendor
    curl -skL https://github.com/containers/common/commit/f2d1b1442077c26c800106219e9e9b2f3838e08b.patch | patch -p1 -d vendor/github.com/containers/common/
    tar zcvf ../cri-o_1.28.2.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp cri-o.spec ../cri-o_1.28.2-1.spec
    cp ../cri-o*1.28.2*.{gz,xz,spec,dsc} /osc/home\:alvistack/cri-o-cri-o-1.28.2/
    rm -rf ../cri-o*1.28.2*.*

See containers/common#1689
See cri-o#7490

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
hswong3i added a commit to alvistack/cri-o-cri-o that referenced this pull request Nov 19, 2023
@hswong3i
alvistack/v1.28.2
b162055 
    git clean -xdf
    go mod download
    go mod vendor
    curl -skL https://github.com/containers/common/commit/f2d1b1442077c26c800106219e9e9b2f3838e08b.patch | patch -p1 -d vendor/github.com/containers/common/
    tar zcvf ../cri-o_1.28.2.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp cri-o.spec ../cri-o_1.28.2-1.spec
    cp ../cri-o*1.28.2*.{gz,xz,spec,dsc} /osc/home\:alvistack/cri-o-cri-o-1.28.2/
    rm -rf ../cri-o*1.28.2*.*

See containers/common#1689
See cri-o#7490
See cri-o#7491

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
hswong3i added a commit to alvistack/cri-o-cri-o that referenced this pull request Nov 19, 2023
@hswong3i
alvistack/v1.27.1
db70387 
    git clean -xdf
    go mod download
    go mod vendor
    curl -skL https://github.com/containers/common/commit/f2d1b1442077c26c800106219e9e9b2f3838e08b.patch | patch -p1 -d vendor/github.com/containers/common/
    tar zcvf ../cri-o_1.27.1.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp cri-o.spec ../cri-o_1.27.1-1.spec
    cp ../cri-o*1.27.1*.{gz,xz,spec,dsc} /osc/home\:alvistack/cri-o-cri-o-1.27.1/
    rm -rf ../cri-o*1.27.1*.*

See containers/common#1689
See cri-o#7490
See cri-o#7491

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
hswong3i added a commit to alvistack/cri-o-cri-o that referenced this pull request Nov 19, 2023
@hswong3i
alvistack/v1.26.4
ec795ce 
    git clean -xdf
    go mod download
    go mod vendor
    curl -skL https://github.com/containers/common/commit/f2d1b1442077c26c800106219e9e9b2f3838e08b.patch | patch -p1 -d vendor/github.com/containers/common/
    tar zcvf ../cri-o_1.26.4.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp cri-o.spec ../cri-o_1.26.4-1.spec
    cp ../cri-o*1.26.4*.{gz,xz,spec,dsc} /osc/home\:alvistack/cri-o-cri-o-1.26.4/
    rm -rf ../cri-o*1.26.4*.*

See containers/common#1689
See cri-o#7490
See cri-o#7491

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
hswong3i added a commit to alvistack/cri-o-cri-o that referenced this pull request Nov 22, 2023
@hswong3i
alvistack/v1.28.2
a167043 
    git clean -xdf
    go mod download
    go mod vendor
    tar zcvf ../cri-o_1.28.2.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp cri-o.spec ../cri-o_1.28.2-1.spec
    cp ../cri-o*1.28.2*.{gz,xz,spec,dsc} /osc/home\:alvistack/cri-o-cri-o-1.28.2/
    rm -rf ../cri-o*1.28.2*.*

See containers/common#1689
See cri-o#7490
See cri-o#7491

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
hswong3i added a commit to alvistack/cri-o-cri-o that referenced this pull request Nov 22, 2023
@hswong3i
alvistack/v1.27.1
5ccadcb 
    git clean -xdf
    go mod download
    go mod vendor
    tar zcvf ../cri-o_1.27.1.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp cri-o.spec ../cri-o_1.27.1-1.spec
    cp ../cri-o*1.27.1*.{gz,xz,spec,dsc} /osc/home\:alvistack/cri-o-cri-o-1.27.1/
    rm -rf ../cri-o*1.27.1*.*

See containers/common#1689
See cri-o#7490
See cri-o#7491

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
hswong3i added a commit to alvistack/cri-o-cri-o that referenced this pull request Nov 22, 2023
@hswong3i
alvistack/v1.26.4
3a864e9 
    git clean -xdf
    go mod download
    go mod vendor
    tar zcvf ../cri-o_1.26.4.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp cri-o.spec ../cri-o_1.26.4-1.spec
    cp ../cri-o*1.26.4*.{gz,xz,spec,dsc} /osc/home\:alvistack/cri-o-cri-o-1.26.4/
    rm -rf ../cri-o*1.26.4*.*

See containers/common#1689
See cri-o#7490
See cri-o#7491

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
hswong3i added a commit to alvistack/cri-o-cri-o that referenced this pull request Dec 18, 2023
@hswong3i
alvistack/v1.27.1
6228a5c 
    git clean -xdf
    go mod download
    go mod vendor
    tar zcvf ../cri-o_1.27.1.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp cri-o.spec ../cri-o_1.27.1-1.spec
    cp ../cri-o*1.27.1*.{gz,xz,spec,dsc} /osc/home\:alvistack/cri-o-cri-o-1.27.1/
    rm -rf ../cri-o*1.27.1*.*

See containers/common#1689
See cri-o#7490
See cri-o#7491

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
hswong3i added a commit to alvistack/cri-o-cri-o that referenced this pull request Dec 18, 2023
@hswong3i
alvistack/v1.28.2
1e11d92 
    git clean -xdf
    go mod download
    go mod vendor
    tar zcvf ../cri-o_1.28.2.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp cri-o.spec ../cri-o_1.28.2-1.spec
    cp ../cri-o*1.28.2*.{gz,xz,spec,dsc} /osc/home\:alvistack/cri-o-cri-o-1.28.2/
    rm -rf ../cri-o*1.28.2*.*

See containers/common#1689
See cri-o#7490
See cri-o#7491

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
hswong3i added a commit to alvistack/cri-o-cri-o that referenced this pull request Dec 22, 2023
@hswong3i
alvistack/v1.27.2
5732689 
    git clean -xdf
    go mod download
    go mod vendor
    tar zcvf ../cri-o_1.27.2.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp cri-o.spec ../cri-o_1.27.2-1.spec
    cp ../cri-o*1.27.2*.{gz,xz,spec,dsc} /osc/home\:alvistack/cri-o-cri-o-1.27.2/
    rm -rf ../cri-o*1.27.2*.*

See containers/common#1689
See cri-o#7490
See cri-o#7491

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
This was referenced Jan 9, 2024
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
hswong3i added a commit to alvistack/cri-o-cri-o that referenced this pull request Jan 12, 2024
@hswong3i
alvistack/v1.27.2
3dc9be0 
    git clean -xdf
    go mod download
    go mod vendor
    tar zcvf ../cri-o_1.27.2.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp cri-o.spec ../cri-o_1.27.2-1.spec
    cp ../cri-o*1.27.2*.{gz,xz,spec,dsc} /osc/home\:alvistack/cri-o-cri-o-1.27.2/
    rm -rf ../cri-o*1.27.2*.*

See containers/common#1689
See cri-o#7490
See cri-o#7491

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
hswong3i added a commit to alvistack/cri-o-cri-o that referenced this pull request Jan 12, 2024
@hswong3i
alvistack/v1.28.2
1ead658 
    git clean -xdf
    go mod download
    go mod vendor
    tar zcvf ../cri-o_1.28.2.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp cri-o.spec ../cri-o_1.28.2-1.spec
    cp ../cri-o*1.28.2*.{gz,xz,spec,dsc} /osc/home\:alvistack/cri-o-cri-o-1.28.2/
    rm -rf ../cri-o*1.28.2*.*

See containers/common#1689
See cri-o#7490
See cri-o#7491

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flouthoc flouthoc flouthoc approved these changes

@Luap99 Luap99 Luap99 approved these changes

Assignees

@flouthoc flouthoc

Labels
approved lgtm
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@vrothberg @flouthoc @Luap99