Skip to content

Commit cee87cc

Browse files
authored
ci(fix): docker image builds for arm64 and bump 3rd-party versions (#369)
Description Fix docker tari arm64 builds Fix version RegEx Bump 3rd-party docker builds Motivation and Context Bring things to date and working How Has This Been Tested? Builds local
1 parent 02a4d22 commit cee87cc

File tree

6 files changed

+21
-16
lines changed

6 files changed

+21
-16
lines changed

build_images.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ fi
155155

156156
# Version refers to the node, wallet, etc.
157157
# applications/tari_app_utilities/Cargo.toml
158-
TL_VERSION=${TL_VERSION:-$(awk -F ' = ' '$1 ~ /version/ \
158+
TL_VERSION=${TL_VERSION:-$(awk -F ' = ' '$1 ~ /^version/ \
159159
{ gsub(/["]/, "", $2); printf("%s",$2) }' \
160160
"${TARI_SOURCE_ROOT}/applications/minotari_node/Cargo.toml")}
161161

docker_rig/monerod.Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# Binary build
99

1010
# https://github.com/monero-project/monero/releases
11-
ARG MONERO_VERSION=0.18.3.1
11+
ARG MONERO_VERSION=0.18.3.3
1212

1313
# https://hub.docker.com/r/bitnami/minideb
1414
ARG OS_BASE=bookworm
@@ -22,7 +22,7 @@ ARG MONERO_TAR=x86_64
2222

2323
# https://github.com/monero-project/monero/releases
2424
# monero-linux-x64
25-
ARG MONERO_AMD64_SHA256=23af572fdfe3459b9ab97e2e9aa7e3c11021c955d6064b801a27d7e8c21ae09d
25+
ARG MONERO_AMD64_SHA256=47c7e6b4b88a57205800a2538065a7874174cd087eedc2526bee1ebcce0cc5e3
2626
ARG MONERO_VERSION
2727

2828
# Declare stage using linux/arm64 base image
@@ -34,7 +34,7 @@ ARG MONERO_TAR=aarch64
3434

3535
# https://github.com/monero-project/monero/releases
3636
# monero-linux-armv8
37-
ARG MONERO_ARM64_SHA256=445032e88dc07e51ac5fff7034752be530d1c4117d8d605100017bcd87c7b21f
37+
ARG MONERO_ARM64_SHA256=eb3f924c085ae5df85f5bf9ee27faaa20acd309835684e27e3fbb98b9666b649
3838
ARG MONERO_VERSION
3939

4040
# Declare TARGETARCH to make it available

docker_rig/tarilabs.Dockerfile

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax = docker/dockerfile:1.3
22

33
# https://hub.docker.com/_/rust
4-
ARG RUST_VERSION=1.76
4+
ARG RUST_VERSION=1.79
55
ARG OS_BASE=bookworm
66

77
# rust source compile with cross platform build support
@@ -63,15 +63,20 @@ RUN apt-get update && \
6363
RUN if [ "${BUILDARCH}" != "${TARGETARCH}" ] ; then \
6464
# Run script to help setup cross-compile environment
6565
. /tari/scripts/cross_compile_tooling.sh ; \
66-
fi && \
67-
if [ -n "${RUST_TOOLCHAIN}" ] ; then \
66+
fi
67+
68+
RUN if [ -n "${RUST_TOOLCHAIN}" ] ; then \
6869
# Install a non-standard toolchain if it has been requested.
6970
# By default we use the toolchain specified in rust-toolchain.toml
7071
rustup toolchain install ${RUST_TOOLCHAIN} --force-non-host ; \
71-
fi && \
72-
rustup target list --installed && \
73-
rustup toolchain list && \
74-
cargo build ${RUST_TARGET} \
72+
fi
73+
74+
# Breaking on arm64 builds
75+
#RUN rustup show && \
76+
# rustup target list --installed && \
77+
# rustup toolchain list
78+
79+
RUN cargo build ${RUST_TARGET} \
7580
--bin ${APP_EXEC} --release --features ${FEATURES} --locked && \
7681
# Copy executable out of the cache so it is available in the runtime image.
7782
cp -v /tari/target/${BUILD_TARGET}release/${APP_EXEC} /tari/${APP_EXEC}

docker_rig/tor.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Package build
22

3-
ARG ALPINE_VERSION=3.18
3+
ARG ALPINE_VERSION=3.20
44

55
FROM alpine:$ALPINE_VERSION
66

@@ -9,7 +9,7 @@ ARG BUILDPLATFORM
99
ARG VERSION=1.0.1
1010

1111
# https://pkgs.alpinelinux.org/packages?name=tor&branch=v3.18&repo=community&arch=&maintainer=
12-
ARG TOR_VERSION=0.4.8.9-r0
12+
ARG TOR_VERSION=0.4.8.12-r0
1313

1414
# Install tor with a minimum version
1515
RUN apk add --no-cache grep curl tor>$TOR_VERSION

docker_rig/xmrig.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# Source build
22

3-
ARG ALPINE_VERSION=3.18
3+
ARG ALPINE_VERSION=3.20
44

55
FROM alpine:$ALPINE_VERSION as builder
66

77
ARG ALPINE_VERSION
88
ARG BUILDPLATFORM
99

1010
# https://github.com/xmrig/xmrig/releases
11-
ARG XMRIG_VERSION="v6.21.0"
11+
ARG XMRIG_VERSION="v6.21.3"
1212

1313
RUN apk add \
1414
git \

hosted-dual.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export TL_TAG_BUILD_OPTS="\
3030

3131
# Pull App version from file
3232
VAPP=$(awk -F ' = ' \
33-
'$1 ~ /version/ { gsub(/["]/, "", $2); printf("%s",$2) }' \
33+
'$1 ~ /^version/ { gsub(/["]/, "", $2); printf("%s",$2) }' \
3434
"${TARI_SOURCE_ROOT}/applications/minotari_node/Cargo.toml")
3535

3636
VBRANCH=$(git --git-dir ${TARI_SOURCE_ROOT}/.git branch --show-current)

0 commit comments

Comments
 (0)