Skip to content

Commit

Permalink
[release] 1.0.2-beta (#1742)
Browse files Browse the repository at this point in the history
adex-cli command line utility was introduced that supplies commands: init, start, stop, status #1729
CI/CD workflow logics are improved #1736
Project root is simplified/refactored #1738
Created base image to provide more glibc compatible pre-built binaries for linux #1741
Set default log level as "info" #1747
  • Loading branch information
ca333 authored Apr 11, 2023
1 parent 6bb79b3 commit fa74561
Show file tree
Hide file tree
Showing 110 changed files with 1,442 additions and 1,031 deletions.
2 changes: 1 addition & 1 deletion Dockerfile → .docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# docker build --tag mm2 .

# NB: The version here was picked to match the one tested in our CI. The latest Travis has (as of 2018-11) is Xenial.
FROM ubuntu:xenial
FROM docker.io/ubuntu:xenial

RUN \
apt-get update &&\
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:16.04
FROM docker.io/ubuntu:16.04

RUN apt-get update && \
apt-get install -y --no-install-recommends \
Expand All @@ -23,7 +23,7 @@ RUN apt-get update && \
libc6-dev-i386 && \
apt-get clean

COPY android-ndk.sh /
COPY ./scripts/ci/android-ndk.sh /
RUN bash /android-ndk.sh arm64 21
ENV PATH=$PATH:/android-ndk/bin
ENV RUSTFMT=rustfmt
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:16.04
FROM docker.io/ubuntu:16.04

RUN apt-get update && \
apt-get install -y --no-install-recommends \
Expand All @@ -23,7 +23,7 @@ RUN apt-get update && \
libc6-dev-i386 && \
apt-get clean

COPY android-ndk.sh /
COPY ./scripts/ci/android-ndk.sh /
RUN bash /android-ndk.sh arm 21
ENV PATH=$PATH:/android-ndk/bin
ENV RUSTFMT=rustfmt
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rustembedded/cross:armv7-unknown-linux-gnueabihf-0.2.1
FROM docker.io/rustembedded/cross:armv7-unknown-linux-gnueabihf-0.2.1
RUN dpkg --add-architecture armhf
RUN apt-get update && apt-get install -y llvm-3.9-dev libclang-3.9-dev clang-3.9 libc6-dev-i386 libssl-dev:armhf && apt-get install -y g++-arm-linux-gnueabihf && apt-get clean
ENV CMAKE_FORCE_C_COMPILER=arm-linux-gnueabihf-gcc \
Expand Down
55 changes: 55 additions & 0 deletions .docker/Dockerfile.ci-container
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
FROM docker.io/debian:buster-slim

MAINTAINER Onur Özkan <[email protected]>

RUN apt-get update -y

RUN apt-get install -y \
build-essential \
cmake \
gcc-multilib \
ca-certificates \
curl \
wget \
gnupg \
git \
zip \
sudo

RUN ln -s /usr/bin/python3 /bin/python

RUN apt install -y \
software-properties-common \
lsb-release \
gnupg

RUN wget https://apt.llvm.org/llvm.sh

RUN chmod +x llvm.sh

RUN ./llvm.sh 16

RUN rm ./llvm.sh

RUN ln -s /usr/bin/clang-16 /usr/bin/clang

ENV AR=/usr/bin/llvm-ar-16
ENV CC=/usr/bin/clang-16

RUN mkdir -m 0755 -p /etc/apt/keyrings

RUN curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg

RUN echo \
"deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \
"$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null

RUN apt-get update -y

RUN apt-get install -y \
docker-ce \
docker-ce-cli \
containerd.io \
docker-buildx-plugin

RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
2 changes: 1 addition & 1 deletion Dockerfile.dev-release → .docker/Dockerfile.dev-release
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:stable-slim
FROM docker.io/debian:stable-slim
WORKDIR /mm2
COPY target/ci/mm2 /usr/local/bin/mm2
EXPOSE 7783
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:16.04
FROM docker.io/ubuntu:16.04

RUN apt-get update && \
apt-get install -y --no-install-recommends \
Expand All @@ -23,7 +23,7 @@ RUN apt-get update && \
libc6-dev-i386 && \
apt-get clean

COPY android-ndk.sh /
COPY ./scripts/ci/android-ndk.sh /
RUN bash /android-ndk.sh x86 21
ENV PATH=$PATH:/android-ndk/bin
ENV RUSTFMT=rustfmt
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.parity.dev → .docker/Dockerfile.parity.dev
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Setup Ethereum dev blockchain with pre-deployed swap contract and ERC20 token.
# For more info check Parity docs: https://wiki.parity.io/Private-development-chain and chain config file: parity.dev.chain.json
# Usage example:
# docker build . -f Dockerfile.parity.dev -t artempikulin/parity_dev_node
# docker build . -f .docker/Dockerfile.parity.dev -t artempikulin/parity_dev_node
# docker run -p 8545:8545 artempikulin/parity_dev_node
FROM parity/parity:beta
COPY parity.dev.chain.json /home/parity/.local/share/io.parity.ethereum/chain.json
FROM docker.io/parity/parity:beta
COPY .docker/parity.dev.chain.json /home/parity/.local/share/io.parity.ethereum/chain.json
USER root
RUN chmod -R 777 /home/parity/.local/share/io.parity.ethereum
USER parity
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.release → .docker/Dockerfile.release
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:stable-slim
FROM docker.io/debian:stable-slim
WORKDIR /mm2
COPY target/release/mm2 /usr/local/bin/mm2
EXPOSE 7783
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.ubuntu.ci → .docker/Dockerfile.ubuntu.ci
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:xenial-20151218.1
FROM docker.io/ubuntu:xenial-20151218.1

RUN \
apt-get update &&\
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:16.04
FROM docker.io/ubuntu:16.04

RUN apt-get update && \
apt-get install -y --no-install-recommends \
Expand All @@ -24,7 +24,7 @@ RUN apt-get update && \
libc6-dev-i386 && \
apt-get clean

COPY android-ndk.sh /
COPY ./scripts/ci/android-ndk.sh /
RUN bash /android-ndk.sh x86_64 21
ENV PATH=$PATH:/android-ndk/bin
ENV RUSTFMT=rustfmt
Expand Down
File renamed without changes.
Loading

0 comments on commit fa74561

Please sign in to comment.