Skip to content

Commit

Permalink
Merge pull request #29 from kvaps/curl
Browse files Browse the repository at this point in the history
Update linstor images
  • Loading branch information
kvaps authored Feb 11, 2021
2 parents 0abba57 + d95f1e9 commit de54967
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
4 changes: 2 additions & 2 deletions dockerfiles/linstor-satellite/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN dpkg-buildpackage -us -uc

FROM debian:buster as utils-builder

ARG UTILS_VERSION=9.15.0
ARG UTILS_VERSION=9.16.0

ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update \
Expand Down Expand Up @@ -82,7 +82,7 @@ RUN apt-get update \
# Install additional tools
RUN sed -i '/^deb / s/main/main contrib/' /etc/apt/sources.list \
&& apt-get update \
&& apt-get install --no-install-recommends -y zfsutils-linux cryptsetup nvme-cli zstd socat \
&& apt-get install --no-install-recommends -y zfsutils-linux cryptsetup nvme-cli zstd socat curl \
&& apt-get download lvm2 \
&& dpkg --unpack lvm2*.deb \
&& rm -f lvm2*.deb /var/lib/dpkg/info/lvm2.postinst \
Expand Down
11 changes: 2 additions & 9 deletions dockerfiles/linstor-stork/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,11 @@ RUN apt-get update \

RUN git clone https://github.com/libopenstorage/stork /go/src/github.com/libopenstorage/stork \
&& cd /go/src/github.com/libopenstorage/stork \
&& git reset --hard v2.6.1
# && rm -f Gopkg.lock Gopkg.toml \
# && go mod init
&& git reset --hard v2.6.2

RUN GO111MODULE=on go get -u -d github.com/libopenstorage/[email protected].1
RUN GO111MODULE=on go get -u -d github.com/libopenstorage/[email protected].2
WORKDIR /go/src/github.com/libopenstorage/stork

#RUN cd cmd/stork \
# && go get -d -u
#RUN cd cmd/storkctl \
# && go get -d -u

RUN make vendor

RUN make stork storkctl \
Expand Down

0 comments on commit de54967

Please sign in to comment.