1- FROM registry.suse.com/bci/golang:1.24
1+ FROM registry.suse.com/bci/bci-base:16.0
22
33ARG DAPPER_HOST_ARCH
44ARG http_proxy
@@ -8,6 +8,8 @@ ARG SRC_BRANCH=master
88ARG SRC_TAG
99ARG CACHEBUST
1010
11+ ARG GOLANG_VERSION=1.24.9
12+
1113# Setup environment
1214ENV PATH /go/bin:$PATH
1315ENV DAPPER_DOCKER_SOCKET true
@@ -20,30 +22,29 @@ ENV SRC_TAG ${SRC_TAG}
2022
2123WORKDIR ${DAPPER_SOURCE}
2224
23- RUN zypper -n addrepo --refresh https://download.opensuse.org/repositories/system:/snappy/SLE_15/system:snappy.repo && \
24- zypper -n addrepo --refresh https://download.opensuse.org/repositories/network:/utilities/15.6/network:utilities.repo && \
25- zypper -n addrepo --refresh https://download.opensuse.org/repositories/devel:libraries:c_c++/15.6/devel:libraries:c_c++.repo && \
26- zypper -n addrepo --refresh https://download.opensuse.org/repositories/devel:languages:python:Factory/15.6/devel:languages:python:Factory.repo && \
27- zypper --gpg-auto-import-keys ref
25+ RUN for i in {1..10}; do \
26+ zypper -n addrepo --refresh https://download.opensuse.org/repositories/devel:tools:compiler/16.0/devel:tools:compiler.repo && \
27+ zypper --gpg-auto-import-keys ref && break || sleep 1; \
28+ done
2829
29- RUN zypper -n install cmake curl wget gcc13 unzip tar xsltproc docbook-xsl-stylesheets python311 python311 -pip fuse3-devel \
30- e2fsprogs xfsprogs util-linux-systemd libcmocka-devel device-mapper procps jq
30+ RUN zypper -n install cmake gcc gcc13 unzip tar xsltproc docbook-xsl-stylesheets python3 python3 -pip fuse3-devel \
31+ e2fsprogs xfsprogs util-linux-systemd libcmocka-devel device-mapper procps jq git
3132
3233# Install Go & tools
3334ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm64=arm64 GOLANG_ARCH=GOLANG_ARCH_${ARCH} \
3435 GOPATH=/go PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash
36+ RUN curl -sSL "https://golang.org/dl/go${GOLANG_VERSION}.linux-${ARCH}.tar.gz" -o /tmp/go.tar.gz \
37+ && tar -C /usr/local -xzf /tmp/go.tar.gz \
38+ && rm /tmp/go.tar.gz
3539RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin latest
3640
37- RUN ln -sf /usr/bin/python3.11 /usr/bin/python3 & \
38- ln -sf /usr/bin/pip3.11 /usr/bin/pip3
39-
40- RUN git clone https://github.com/longhorn/dep-versions.git -b ${SRC_BRANCH} /usr/src/dep-versions && \
41+ RUN git clone https://github.com/derekbit/dep-versions.git -b ${SRC_BRANCH} /usr/src/dep-versions && \
4142 cd /usr/src/dep-versions && \
4243 if [ -n "${SRC_TAG}" ] && git show-ref --tags ${SRC_TAG} > /dev/null 2>&1; then \
4344 echo "Checking out tag ${SRC_TAG}"; \
4445 cd /usr/src/dep-versions && git checkout tags/${SRC_TAG}; \
4546 fi && \
46- echo "dep-versions commit: $(git rev-parse HEAD)"
47+ echo "===> dep-versions commit: $(git rev-parse HEAD)"
4748
4849# Build spdk
4950RUN export REPO_OVERRIDE="" && \
0 commit comments