@@ -5,7 +5,6 @@ ARG http_proxy
5
5
ARG https_proxy
6
6
7
7
ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH}
8
- ENV PATH /go/bin:$PATH
9
8
ENV DAPPER_DOCKER_SOCKET true
10
9
ENV DAPPER_ENV TAG REPO DRONE_REPO DRONE_PULL_REQUEST DRONE_COMMIT_REF
11
10
ENV DAPPER_OUTPUT bin coverage.out
@@ -16,25 +15,18 @@ ENTRYPOINT ["./scripts/entry"]
16
15
CMD ["ci"]
17
16
18
17
RUN zypper -n addrepo --refresh https://download.opensuse.org/repositories/system:/snappy/SLE_15/system:snappy.repo && \
19
- zypper --gpg-auto-import-keys ref && \
20
- zypper -n ref && \
21
- zypper update -y
18
+ zypper --gpg-auto-import-keys ref
22
19
23
20
# Install packages
24
21
RUN zypper -n install cmake wget curl git less file \
25
22
libkmod-devel libnl3-devel linux-glibc-devel pkg-config psmisc python3-tox fuse python3-devel qemu-tools \
26
23
bash-completion librdmacm1 librdmacm-utils libibverbs xsltproc docbook-xsl-stylesheets \
27
24
perl-Config-General libaio-devel glibc-devel-static glibc-devel iptables libltdl7 libdevmapper1_03 iproute2 jq docker gcc
28
25
29
- # FIXME: Needed for ${!var} substitution
30
- RUN rm -f /bin/ sh && ln -s /bin/bash /bin/sh
26
+ ## Install golangci-lint
27
+ RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install. sh | sh -s -- -b /go/bin v1.55.2
31
28
32
- # Install tools
33
-
34
- ## golangci-lint
35
- RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2
36
-
37
- ## Docker Buildx: The docker version in dapper is too old to have buildx. Install it manually.
38
- RUN wget https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-${ARCH} && \
29
+ ## Install Docker Buildx: The docker version in dapper is too old to have buildx. Install it manually.
30
+ RUN curl -sSfLO https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-${ARCH} && \
39
31
chmod +x buildx-v0.13.1.linux-${ARCH} && \
40
32
mv buildx-v0.13.1.linux-${ARCH} /usr/local/bin/buildx
0 commit comments