diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 229dc6019d..24c7b26c6e 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -16,7 +16,7 @@ RUN if [ ${ARCH} == "s390x" ]; then \ ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm64=arm64 GOLANG_ARCH_s390x=s390x GOLANG_ARCH=GOLANG_ARCH_${ARCH} \ GOPATH=/go PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash -RUN wget -O - https://storage.googleapis.com/golang/go1.21.3.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local +RUN wget -O - https://storage.googleapis.com/golang/go1.22.4.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2 diff --git a/package/Dockerfile b/package/Dockerfile index afde0e4cc6..6a9f4a1aa9 100644 --- a/package/Dockerfile +++ b/package/Dockerfile @@ -14,7 +14,7 @@ COPY package/bin/longhorn-manager-${ARCH} /usr/local/sbin/longhorn-manager COPY package/launch-manager package/nsmounter /usr/local/sbin/ -RUN zypper -n install iputils iproute2 nfs-client cifs-utils bind-utils e2fsprogs xfsprogs zip unzip && \ +RUN zypper update -y && zypper -n install iputils iproute2 nfs-client cifs-utils bind-utils e2fsprogs xfsprogs zip unzip && \ rm -rf /var/cache/zypp/* VOLUME /usr/local/sbin diff --git a/scripts/build b/scripts/build index f7b7091ab9..c83e26dccf 100755 --- a/scripts/build +++ b/scripts/build @@ -21,4 +21,4 @@ cd $(dirname $0)/.. mkdir -p bin CGO_ENABLED=0 GOARCH=amd64 go build -o bin/longhorn-manager-amd64 -ldflags "$LINKFLAGS $OTHER_LINKFLAGS" $COVER $COVERPKG -CGO_ENABLED=0 GOARCH=arm64 go build -o bin/longhorn-manager-arm64 -ldflags "$LINKFLAGS $OTHER_LINKFLAGS" $COVER $COVERPKG +#CGO_ENABLED=0 GOARCH=arm64 go build -o bin/longhorn-manager-arm64 -ldflags "$LINKFLAGS $OTHER_LINKFLAGS" $COVER $COVERPKG diff --git a/scripts/package b/scripts/package index 8c118452fd..3f85c9c15f 100755 --- a/scripts/package +++ b/scripts/package @@ -9,9 +9,9 @@ TAG=${TAG:-${IMAGE_TAG_PREFIX}} REPO=${REPO:-longhornio} IMAGE=${IMAGE:-${REPO}/longhorn-manager:${TAG}} -if [ ! -e ./bin/longhorn-manager ]; then - ./scripts/build -fi +#if [ ! -e ./bin/longhorn-manager ]; then +# ./scripts/build +#fi cp -r bin package/