Skip to content

Commit

Permalink
ci: update Dockerfile to fix broken tests
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
cyphar committed Sep 21, 2017
1 parent a3bb7e9 commit d26c98d
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN zypper ar -f -p 10 -g obs://Virtualization:containers obs-vc && \
zypper ar -f -p 10 -g obs://devel:languages:go obs-dlg && \
zypper ar -f -p 10 -g obs://home:cyphar:containers obs-home-cyphar-containers && \
zypper ar -f -p 15 -g obs://home:cyphar obs-home-cyphar && \
zypper ar -f -p 15 -g obs://devel:languages:python3 obs-py3k && \
zypper ar -f -p 15 -g obs://devel:languages:python obs-py && \
zypper --gpg-auto-import-keys -n ref && \
zypper -n up
RUN zypper -n in \
Expand All @@ -36,8 +36,7 @@ RUN zypper -n in \
moreutils \
oci-image-tools \
oci-runtime-tools \
python3-setuptools \
python3-xattr \
python-setuptools python-xattr \
skopeo

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

0 comments on commit d26c98d

Please sign in to comment.