Skip to content

Commit 5149c63

Browse files
committed
ci: update Dockerfile to fix broken tests
Due to some weird py3k issue that has manifested recently, our CI started breaking due to errors within xattr. Switch to a newer version (since it looks like the python3-* version is not maintained anymore in the py3k repo). Signed-off-by: Aleksa Sarai <asarai@suse.de>
1 parent 0bdddfd commit 5149c63

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN zypper ar -f -p 10 -g obs://Virtualization:containers obs-vc && \
2222
zypper ar -f -p 10 -g obs://devel:languages:go obs-dlg && \
2323
zypper ar -f -p 10 -g obs://home:cyphar:containers obs-home-cyphar-containers && \
2424
zypper ar -f -p 15 -g obs://home:cyphar obs-home-cyphar && \
25-
zypper ar -f -p 15 -g obs://devel:languages:python3 obs-py3k && \
25+
zypper ar -f -p 15 -g obs://devel:languages:python obs-py && \
2626
zypper --gpg-auto-import-keys -n ref && \
2727
zypper -n up
2828
RUN zypper -n in \
@@ -36,8 +36,7 @@ RUN zypper -n in \
3636
moreutils \
3737
oci-image-tools \
3838
oci-runtime-tools \
39-
python3-setuptools \
40-
python3-xattr \
39+
python-setuptools python-xattr \
4140
skopeo
4241

4342
ENV GOPATH /go
@@ -51,7 +50,8 @@ RUN go get -u github.com/golang/lint/golint
5150
# Reinstall skopeo from source, since there's a bootstrapping issue because
5251
# packaging of skopeo in openSUSE is often blocked by umoci updates (since KIWI
5352
# uses both). XXX: This should no longer be necessary once we hit OCI v1.0.
54-
ENV SKOPEO_VERSION=v0.1.23 SKOPEO_PROJECT=github.com/projectatomic/skopeo
53+
# XXX: Switch to proper version once v0.1.24 is released.
54+
ENV SKOPEO_VERSION=875dd2e7a965adb92dfc97c69eaceba9d33b27ba SKOPEO_PROJECT=github.com/projectatomic/skopeo
5555
RUN zypper -n in \
5656
device-mapper-devel \
5757
glib2-devel \

0 commit comments

Comments
 (0)