Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci(fix): bump 3rdparty docker release #218

Merged
merged 3 commits into from
Jul 24, 2023
Merged

ci(fix): bump 3rdparty docker release #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d92352d
Add integration_tests folder and bump rust docker base image to 1.67
leet4tari Feb 3, 2023
6d07071
Merge remote-tracking branch 'tari/main' into build-leet-tari-docker
leet4tari Apr 3, 2023
8a4f6e0
Bump monerod, rust image, tor and xmrig release
leet4tari Apr 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docker_rig/monerod.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# Binary build

# https://github.com/monero-project/monero/releases
ARG MONERO_VERSION=0.18.1.2
ARG MONERO_VERSION=0.18.2.0

# Declare stage using linux/amd64 base image
FROM --platform=linux/amd64 bitnami/minideb:bullseye AS build-stage-amd64
Expand All @@ -18,7 +18,7 @@ ARG MONERO_ARCH=x64
ARG MONERO_TAR=x86_64

# https://github.com/monero-project/monero/releases
ARG MONERO_AMD64_SHA256=7d51e7072351f65d0c7909e745827cfd3b00abe5e7c4cc4c104a3c9b526da07e
ARG MONERO_AMD64_SHA256=83e6517dc9e5198228ee5af50f4bbccdb226fe69ff8dd54404dddb90a70b7322
ARG MONERO_VERSION

# Declare stage using linux/arm64 base image
Expand All @@ -29,7 +29,7 @@ ARG MONERO_ARCH=armv8
ARG MONERO_TAR=aarch64

# https://github.com/monero-project/monero/releases
ARG MONERO_ARM64_SHA256=e1467fe289c98349be2b1c4c080e30a224eb3217c814fab0204241b2b19b9c6b
ARG MONERO_ARM64_SHA256=fb20eaf9b04020abdf883eb339258814742a1452653c1f5d8705d16e90413f35
ARG MONERO_VERSION

# Declare TARGETARCH to make it available
Expand Down
14 changes: 11 additions & 3 deletions docker_rig/tarilabs.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# syntax = docker/dockerfile:1.3

# https://hub.docker.com/_/rust
ARG RUST_VERSION=1.68

# rust source compile with cross platform build support
FROM --platform=$BUILDPLATFORM rust:1.67-bullseye as builder
FROM --platform=$BUILDPLATFORM rust:$RUST_VERSION-bullseye as builder

# Declare to make available
ARG BUILDPLATFORM
Expand All @@ -12,6 +16,8 @@ ARG TARGETOS
ARG TARGETARCH
ARG TARGETVARIANT
ARG RUST_TOOLCHAIN
ARG RUST_TARGET
ARG RUST_VERSION

# Disable anti-cache
RUN rm -f /etc/apt/apt.conf.d/docker-clean; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
Expand Down Expand Up @@ -85,12 +91,12 @@ RUN --mount=type=cache,id=rust-git-${TARGETOS}-${TARGETARCH}${TARGETVARIANT},sha
export RUSTFLAGS="-C target_cpu=$ARCH" && \
export ROARING_ARCH=$ARCH && \
rustup target add aarch64-unknown-linux-gnu && \
rustup toolchain install stable-aarch64-unknown-linux-gnu ; \
rustup toolchain install stable-aarch64-unknown-linux-gnu --force-non-host ; \
fi && \
if [ -n "${RUST_TOOLCHAIN}" ] ; then \
# Install a non-standard toolchain if it has been requested.
# By default we use the toolchain specified in rust-toolchain.toml
rustup toolchain install ${RUST_TOOLCHAIN} ; \
rustup toolchain install ${RUST_TOOLCHAIN} --force-non-host ; \
fi && \
rustup target list --installed && \
rustup toolchain list && \
Expand All @@ -106,6 +112,7 @@ ARG BUILDPLATFORM
ARG TARGETOS
ARG TARGETARCH
ARG TARGETVARIANT
ARG RUST_VERSION

ARG VERSION

Expand Down Expand Up @@ -136,6 +143,7 @@ RUN groupadd --gid 1000 tari && \

ENV dockerfile_version=$VERSION
ENV dockerfile_build_arch=$BUILDPLATFORM
ENV rust_version=$RUST_VERSION
ENV APP_NAME=${APP_NAME:-wallet}
ENV APP_EXEC=${APP_EXEC:-tari_console_wallet}

Expand Down
2 changes: 1 addition & 1 deletion docker_rig/tor.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ARG BUILDPLATFORM
ARG VERSION=1.0.1

# https://pkgs.alpinelinux.org/packages?name=tor&branch=v3.17&repo=community&arch=&maintainer=
ARG TOR_VERSION=0.4.7.12-r0
ARG TOR_VERSION=0.4.7.13-r0

# Install tor with a minimum version
RUN apk update \
Expand Down
2 changes: 1 addition & 1 deletion docker_rig/xmrig.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ARG ALPINE_VERSION
ARG BUILDPLATFORM

# https://github.com/xmrig/xmrig/releases
ARG XMRIG_VERSION="v6.18.1"
ARG XMRIG_VERSION="v6.19.1"

RUN apk add \
git \
Expand Down