From f9c9a3e0fcb1c082680da0cc4e12a74b12f0c428 Mon Sep 17 00:00:00 2001 From: pascallapointe <3847945+pascallapointe@users.noreply.github.com> Date: Mon, 23 Sep 2024 09:53:27 -0400 Subject: [PATCH 1/6] Updated doc with cross-platform command tip. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index fd639c8..856ad55 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,8 @@ First, you need to build all required images: -t cardano_node:${NODE_TAG} Dockerfiles/node ``` + ** Tip: Prepend `docker buildx build --platform=linux/amd64` to build for **amd64**. + 6. The submit api image: ```bash From a500e2bfad5896bae4007193ce20337d93a19083 Mon Sep 17 00:00:00 2001 From: pascallapointe <3847945+pascallapointe@users.noreply.github.com> Date: Mon, 23 Sep 2024 10:00:32 -0400 Subject: [PATCH 2/6] Updated db-sync build doc. --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 856ad55..3991d06 100644 --- a/README.md +++ b/README.md @@ -80,10 +80,12 @@ First, you need to build all required images: 7. The DB-Sync image: ```bash + DBSYNC_TAG= + docker build \ --build-arg ARCHITECTURE=${ARCHITECTURE} \ - --build-arg RELEASE=${VERSION_NUMBER} \ - -t cardano_db_sync:${VERSION_NUMBER} Dockerfiles/db-sync + --build-arg RELEASE=${DBSYNC_TAG} \ + -t cardano_db_sync:${DBSYNC_TAG} Dockerfiles/db-sync ``` 8. Tag your image with the **latest** tag: From 6e37b359cc275d06958a24d179af6a989f603728 Mon Sep 17 00:00:00 2001 From: pascallapointe <3847945+pascallapointe@users.noreply.github.com> Date: Mon, 23 Sep 2024 15:29:06 -0400 Subject: [PATCH 3/6] Updated db-sync dockerfile. --- Dockerfiles/db-sync/Dockerfile | 82 +++++++++++++++++----------------- 1 file changed, 40 insertions(+), 42 deletions(-) diff --git a/Dockerfiles/db-sync/Dockerfile b/Dockerfiles/db-sync/Dockerfile index 082b560..81a7b26 100644 --- a/Dockerfiles/db-sync/Dockerfile +++ b/Dockerfiles/db-sync/Dockerfile @@ -1,16 +1,14 @@ -FROM cardano_env +FROM cardano_env AS base -LABEL name="cardano_node" -LABEL description="Cardano node" +LABEL name="db_sync" +LABEL description="Cardano DB Sync" LABEL maintainer="https://github.com/pascallapointe" WORKDIR /root # Install base utilities and dependencies -RUN apt-get update -RUN apt-get install -y libghc-postgresql-libpq-dev -RUN apt-get install -y libpq5 -RUN apt-get install -y postgresql postgresql-contrib +RUN apt-get update && \ + apt-get install -y libghc-postgresql-libpq-dev libpq5 postgresql postgresql-contrib # Download cardano-node repository ARG RELEASE @@ -21,16 +19,14 @@ WORKDIR /root/cardano-db-sync RUN git checkout ${RELEASE} # Build cardano-node binary -RUN cabal update -RUN cabal build cardano-db-sync -RUN cabal build all +RUN cabal update && cabal build cardano-db-sync && cabal build cardano-db-sync cardano-db-tool --disable-tests # Create files structure RUN mkdir -p /cardano/config /cardano/bin /cardano/ledger-state ARG RELEASE_PATH=$RELEASE ARG GHC_VERSION=ghc-9.6.4 -RUN cp -p dist-newstyle/build/${ARCHITECTURE}-linux/${GHC_VERSION}/cardano-db-sync-${RELEASE_PATH}/build/cardano-db-sync/cardano-db-sync /cardano/bin -RUN cp -p dist-newstyle/build/${ARCHITECTURE}-linux/${GHC_VERSION}/cardano-db-tool-${RELEASE_PATH}/x/cardano-db-tool/build/cardano-db-tool/cardano-db-tool /cardano/bin +RUN cp -p dist-newstyle/build/${ARCHITECTURE}-linux/${GHC_VERSION}/cardano-db-sync-${RELEASE_PATH}/build/cardano-db-sync/cardano-db-sync /cardano/bin && \ + cp -p dist-newstyle/build/${ARCHITECTURE}-linux/${GHC_VERSION}/cardano-db-tool-${RELEASE_PATH}/x/cardano-db-tool/build/cardano-db-tool/cardano-db-tool /cardano/bin WORKDIR /root RUN mv cardano-db-sync/schema /cardano/. @@ -39,44 +35,46 @@ RUN mv cardano-db-sync/schema /cardano/. COPY files/start.sh /cardano/scripts/start.sh COPY files/sleep.sh /cardano/scripts/sleep.sh -# Creating non root user cardano -RUN useradd -m cardano - # Add permissions -RUN chown -R cardano:cardano /cardano -RUN chmod g+s /cardano -RUN chmod 540 /cardano/scripts/* -RUN chmod 540 /cardano/bin/* - -ENV PATH=/cardano/scripts:/cardano/bin:$PATH +RUN chmod g+s /cardano && \ + chmod 540 /cardano/scripts/* && \ + chmod 540 /cardano/bin/* # Image clean-up WORKDIR /root #RUN cabal clean -RUN rm -rf cardano-db-sync -RUN rm -rf .cabal .local -RUN apt-get purge -y apt-utils -RUN apt-get purge -y git -RUN apt-get purge -y wget -RUN apt-get purge -y pkg-config -RUN apt-get purge -y libgmp-dev -RUN apt-get purge -y libssl-dev -RUN apt-get purge -y libtinfo-dev -RUN apt-get purge -y libsystemd-dev -RUN apt-get purge -y zlib1g-dev -RUN apt-get purge -y llvm -RUN apt-get purge -y build-essential -RUN apt-get purge -y libffi-dev -RUN apt-get purge -y make -RUN apt-get purge -y g++ - -RUN apt-get autoremove -y -RUN apt-get clean -RUN apt-get autoclean +RUN rm -rf cardano-db-sync && \ + rm -rf .cabal .local && \ + apt-get purge -y apt-utils && \ + apt-get purge -y git && \ + apt-get purge -y wget && \ + apt-get purge -y pkg-config && \ + apt-get purge -y libgmp-dev && \ + apt-get purge -y libssl-dev && \ + apt-get purge -y libtinfo-dev && \ + apt-get purge -y libsystemd-dev && \ + apt-get purge -y zlib1g-dev && \ + apt-get purge -y llvm && \ + apt-get purge -y build-essential && \ + apt-get purge -y libffi-dev && \ + apt-get purge -y make && \ + apt-get purge -y g++ + +RUN apt-get autoremove -y && \ + apt-get clean && \ + apt-get autoclean + +FROM ubuntu:jammy +COPY --from=base / / + +ENV PATH=/cardano/scripts:/cardano/bin:$PATH +ENV CARDANO_NODE_SOCKET_PATH=/cardano/socket/node.sock +ENV LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" +ENV PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" # Switch user -USER cardano:cardano +# USER cardano:cardano WORKDIR /cardano CMD ["/bin/bash", "-c", "start.sh"] From 2e9019114fed1a77e7761096d8999c7d5f66fc14 Mon Sep 17 00:00:00 2001 From: pascallapointe <3847945+pascallapointe@users.noreply.github.com> Date: Tue, 24 Sep 2024 13:57:05 -0400 Subject: [PATCH 4/6] Updated build environment. --- Dockerfiles/build_env/aarch64/Dockerfile | 6 +++--- Dockerfiles/db-sync/Dockerfile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfiles/build_env/aarch64/Dockerfile b/Dockerfiles/build_env/aarch64/Dockerfile index 230c27e..cd05778 100644 --- a/Dockerfiles/build_env/aarch64/Dockerfile +++ b/Dockerfiles/build_env/aarch64/Dockerfile @@ -34,7 +34,7 @@ RUN git clone https://github.com/bitcoin-core/secp256k1.git WORKDIR /root/secp256k1 -RUN git reset --hard ac83be33d0956faf6b7f61a60ab524ef7d6a473a &&\ +RUN git checkout v0.3.2 &&\ ./autogen.sh &&\ ./configure --enable-module-schnorrsig --enable-experimental &&\ make &&\ @@ -46,7 +46,7 @@ WORKDIR /root RUN git clone https://github.com/input-output-hk/libsodium WORKDIR /root/libsodium -RUN git checkout dbb48cc &&\ +RUN git checkout dbb48cce5429cb6585c9034f002568964f1ce567 &&\ ./autogen.sh &&\ ./configure &&\ make &&\ @@ -60,7 +60,7 @@ WORKDIR /root # Install BLST dependencies RUN git clone https://github.com/supranational/blst WORKDIR /root/blst -RUN git checkout v0.3.10 &&\ +RUN git checkout v0.3.11 &&\ ./build.sh COPY files/libblst.pc /usr/local/lib/pkgconfig/libblst.pc RUN cp bindings/blst_aux.h bindings/blst.h bindings/blst.hpp /usr/local/include/ &&\ diff --git a/Dockerfiles/db-sync/Dockerfile b/Dockerfiles/db-sync/Dockerfile index 81a7b26..78f21c6 100644 --- a/Dockerfiles/db-sync/Dockerfile +++ b/Dockerfiles/db-sync/Dockerfile @@ -19,7 +19,7 @@ WORKDIR /root/cardano-db-sync RUN git checkout ${RELEASE} # Build cardano-node binary -RUN cabal update && cabal build cardano-db-sync && cabal build cardano-db-sync cardano-db-tool --disable-tests +RUN cabal update && cabal build cardano-db-sync cardano-db-tool # Create files structure RUN mkdir -p /cardano/config /cardano/bin /cardano/ledger-state From 5dd7793a21b698c64e151326a2a5ddadcd609350 Mon Sep 17 00:00:00 2001 From: pascallapointe <3847945+pascallapointe@users.noreply.github.com> Date: Sat, 28 Sep 2024 14:49:11 -0400 Subject: [PATCH 5/6] Dockerfiles update/cleanup. Fixed Db-Sync build. --- Dockerfiles/build_env/aarch64/Dockerfile | 2 +- Dockerfiles/build_env/x86_64/Dockerfile | 2 +- Dockerfiles/db-sync/Dockerfile | 38 ++++++++------------ Dockerfiles/mithril-client/Dockerfile | 12 +------ Dockerfiles/mithril-signer/Dockerfile | 15 ++------ Dockerfiles/node/Dockerfile | 24 ++++--------- Dockerfiles/submit/Dockerfile | 28 ++++----------- Dockerfiles/submit/files/cabal.project.local | 3 -- README.md | 2 +- 9 files changed, 33 insertions(+), 93 deletions(-) delete mode 100644 Dockerfiles/submit/files/cabal.project.local diff --git a/Dockerfiles/build_env/aarch64/Dockerfile b/Dockerfiles/build_env/aarch64/Dockerfile index cd05778..1b1c1c2 100644 --- a/Dockerfiles/build_env/aarch64/Dockerfile +++ b/Dockerfiles/build_env/aarch64/Dockerfile @@ -13,7 +13,7 @@ WORKDIR /root RUN apt-get update && \ apt-get install -y apt-utils git wget curl pkg-config \ libgmp-dev libssl-dev libtinfo-dev libsystemd-dev liblmdb-dev \ - libsodium-dev zlib1g-dev llvm-14 automake make build-essential \ + zlib1g-dev llvm-dev automake make build-essential \ libffi-dev libncursesw5 g++ jq libnuma-dev libtool autoconf # Install Rust diff --git a/Dockerfiles/build_env/x86_64/Dockerfile b/Dockerfiles/build_env/x86_64/Dockerfile index 4dca4fc..37b64e7 100644 --- a/Dockerfiles/build_env/x86_64/Dockerfile +++ b/Dockerfiles/build_env/x86_64/Dockerfile @@ -13,7 +13,7 @@ WORKDIR /root RUN apt-get update && \ apt-get install -y apt-utils git wget curl pkg-config \ libgmp-dev libssl-dev libtinfo-dev libsystemd-dev liblmdb-dev \ - libsodium-dev zlib1g-dev llvm-14 automake make build-essential \ + zlib1g-dev llvm-dev automake make build-essential \ libffi-dev libncursesw5 g++ jq libnuma-dev libtool autoconf # Install Rust diff --git a/Dockerfiles/db-sync/Dockerfile b/Dockerfiles/db-sync/Dockerfile index 78f21c6..d514e53 100644 --- a/Dockerfiles/db-sync/Dockerfile +++ b/Dockerfiles/db-sync/Dockerfile @@ -8,21 +8,24 @@ WORKDIR /root # Install base utilities and dependencies RUN apt-get update && \ - apt-get install -y libghc-postgresql-libpq-dev libpq5 postgresql postgresql-contrib + apt-get install -y libpq-dev postgresql-client -# Download cardano-node repository +# Download Db-Sync repository ARG RELEASE -ARG ARCHITECTURE ARG PGPASSFILE="config/pgpass-mainnet scripts/postgresql-setup.sh --createdb" RUN git clone https://github.com/input-output-hk/cardano-db-sync WORKDIR /root/cardano-db-sync -RUN git checkout ${RELEASE} +RUN git checkout ${RELEASE} && git submodule update --init --recursive -# Build cardano-node binary -RUN cabal update && cabal build cardano-db-sync cardano-db-tool +# Build db-sync binary +RUN cabal update && \ + cabal user-config update && \ + cabal build cardano-db-sync --disable-tests && \ + cabal build cardano-db-tool --disable-tests # Create files structure RUN mkdir -p /cardano/config /cardano/bin /cardano/ledger-state +ARG ARCHITECTURE ARG RELEASE_PATH=$RELEASE ARG GHC_VERSION=ghc-9.6.4 RUN cp -p dist-newstyle/build/${ARCHITECTURE}-linux/${GHC_VERSION}/cardano-db-sync-${RELEASE_PATH}/build/cardano-db-sync/cardano-db-sync /cardano/bin && \ @@ -46,22 +49,11 @@ WORKDIR /root #RUN cabal clean RUN rm -rf cardano-db-sync && \ rm -rf .cabal .local && \ - apt-get purge -y apt-utils && \ - apt-get purge -y git && \ - apt-get purge -y wget && \ - apt-get purge -y pkg-config && \ - apt-get purge -y libgmp-dev && \ - apt-get purge -y libssl-dev && \ - apt-get purge -y libtinfo-dev && \ - apt-get purge -y libsystemd-dev && \ - apt-get purge -y zlib1g-dev && \ - apt-get purge -y llvm && \ - apt-get purge -y build-essential && \ - apt-get purge -y libffi-dev && \ - apt-get purge -y make && \ - apt-get purge -y g++ - -RUN apt-get autoremove -y && \ + apt-get purge -y apt-utils git wget pkg-config libgmp-dev \ + libssl-dev libtinfo-dev libsystemd-dev liblmdb-dev libtool \ + zlib1g-dev llvm-dev build-essential libffi-dev automake \ + make g++ libncursesw5 jq autoconf libpq-dev &&\ + apt-get autoremove -y && \ apt-get clean && \ apt-get autoclean @@ -73,8 +65,6 @@ ENV CARDANO_NODE_SOCKET_PATH=/cardano/socket/node.sock ENV LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" ENV PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" -# Switch user -# USER cardano:cardano WORKDIR /cardano CMD ["/bin/bash", "-c", "start.sh"] diff --git a/Dockerfiles/mithril-client/Dockerfile b/Dockerfiles/mithril-client/Dockerfile index 8d685d0..b288d67 100644 --- a/Dockerfiles/mithril-client/Dockerfile +++ b/Dockerfiles/mithril-client/Dockerfile @@ -17,20 +17,12 @@ WORKDIR /root/mithril RUN git checkout ${MITHRIL_TAG} WORKDIR /root/mithril/mithril-client-cli -# Support for Asahi Linux 16kb memory page, to be commented if not needed -#ENV JEMALLOC_SYS_WITH_LG_PAGE=16 - # Build mithril binary RUN make build RUN cp mithril-client /cardano/bin -# Creating non root user cardano -# RUN useradd -m cardano - # Add permissions -# RUN chown -R cardano:cardano /cardano -RUN chmod g+s /cardano -RUN chmod 540 /cardano/bin/* +RUN chmod g+s /cardano && chmod 540 /cardano/bin/* ENV PATH=/cardano/scripts:/cardano/bin:$PATH @@ -58,8 +50,6 @@ ENV CARDANO_NODE_SOCKET_PATH=/cardano/socket/node.sock ENV LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" ENV PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" -# Switch user -# USER cardano:cardano WORKDIR /cardano CMD ["/bin/bash", "-c", "tail","-f","/dev/null"] diff --git a/Dockerfiles/mithril-signer/Dockerfile b/Dockerfiles/mithril-signer/Dockerfile index 0844032..7ca027f 100644 --- a/Dockerfiles/mithril-signer/Dockerfile +++ b/Dockerfiles/mithril-signer/Dockerfile @@ -17,10 +17,7 @@ WORKDIR /root/cardano-cli ARG GHC_VERSION=ghc-9.6.4 RUN git checkout cardano-cli-${CLI_TAG} && git submodule update --init --recursive -# Add cabal config files -RUN echo 'jobs: 4\npackage cardano-crypto-praos\n flags: +external-libsodium-vrf\n' > /root/cardano-cli/cabal.project.local - -# Build cardano-node binary +# Build cardano-cli binary RUN cabal update && cabal user-config update && cabal build cardano-cli --disable-tests RUN cp -p dist-newstyle/build/${ARCHITECTURE}-linux/${GHC_VERSION}/cardano-cli-${CLI_TAG}/x/cardano-cli/build/cardano-cli/cardano-cli /cardano/bin @@ -43,14 +40,8 @@ RUN mkdir -p /cardano/stores # Add startup scripts COPY files/start.sh /cardano/scripts/start.sh -# Creating non root user cardano -# RUN useradd -m cardano - # Add permissions -# RUN chown -R cardano:cardano /cardano -RUN chmod g+s /cardano -RUN chmod 540 /cardano/scripts/* -RUN chmod 540 /cardano/bin/* +RUN chmod g+s /cardano && chmod 540 /cardano/scripts/* && chmod 540 /cardano/bin/* ENV PATH=/cardano/scripts:/cardano/bin:$PATH ENV CARDANO_NODE_SOCKET_PATH=/cardano/socket/node.sock @@ -83,8 +74,6 @@ ENV CARDANO_NODE_SOCKET_PATH=/cardano/socket/node.sock ENV LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" ENV PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" -# Switch user -# USER cardano:cardano WORKDIR /cardano CMD ["/bin/bash", "-c", "start.sh"] diff --git a/Dockerfiles/node/Dockerfile b/Dockerfiles/node/Dockerfile index 0decb40..78f133e 100644 --- a/Dockerfiles/node/Dockerfile +++ b/Dockerfiles/node/Dockerfile @@ -12,11 +12,8 @@ RUN git clone https://github.com/IntersectMBO/cardano-node.git WORKDIR /root/cardano-node RUN git checkout ${NODE_TAG} && git submodule update --init --recursive -# Add cabal config files -RUN echo 'jobs: 4\npackage cardano-crypto-praos\n flags: +external-libsodium-vrf\n' > /root/cardano-node/cabal.project.local - # Build cardano-node binary -RUN cabal update && cabal user-config update && cabal build cardano-node --disable-tests +RUN cabal update && cabal build cardano-node --disable-tests # Create files structure ARG GHC_VERSION=ghc-9.6.4 @@ -33,11 +30,8 @@ RUN git clone https://github.com/IntersectMBO/cardano-cli.git WORKDIR /root/cardano-cli RUN git checkout cardano-cli-${CLI_TAG} && git submodule update --init --recursive -# Add cabal config files -RUN echo 'jobs: 4\npackage cardano-crypto-praos\n flags: +external-libsodium-vrf\n' > /root/cardano-cli/cabal.project.local - -# Build cardano-node binary -RUN cabal update && cabal user-config update && cabal build cardano-cli --disable-tests +# Build cardano-cli binary +RUN cabal update && cabal build cardano-cli --disable-tests RUN cp -p dist-newstyle/build/${ARCHITECTURE}-linux/${GHC_VERSION}/cardano-cli-${CLI_TAG}/x/cardano-cli/build/cardano-cli/cardano-cli /cardano/bin @@ -50,11 +44,7 @@ COPY files/start-with-topology.sh /cardano/scripts/start-with-topology.sh # USE CURL, DO NOT UNINSTALL CURL COPY files/topologyUpdater.sh /cardano/scripts/topologyUpdater.sh -# Creating non root user cardano -# RUN useradd -m cardano - # Add permissions -# RUN chown -R cardano:cardano /cardano RUN chmod g+s /cardano && chmod 540 /cardano/scripts/* && chmod 540 /cardano/bin/* # Image clean-up @@ -67,9 +57,9 @@ RUN cabal clean &&\ rm -rf .cabal .local .ghcup .ghc .cache ghcup &&\ rustup self uninstall -y &&\ apt-get purge -y apt-utils git wget pkg-config libgmp-dev \ - libssl-dev libtinfo-dev libsystemd-dev liblmdb-dev libtool \ - zlib1g-dev llvm-14 build-essential libffi-dev automake \ - make g++ libncursesw5 jq autoconf &&\ + libssl-dev libtinfo-dev libsystemd-dev liblmdb-dev libtool \ + zlib1g-dev llvm-dev build-essential libffi-dev automake \ + make g++ libncursesw5 jq autoconf &&\ apt-get autoremove -y &&\ apt-get clean &&\ apt-get autoclean @@ -82,8 +72,6 @@ ENV CARDANO_NODE_SOCKET_PATH=/cardano/socket/node.sock ENV LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" ENV PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" -# Switch user -# USER cardano:cardano WORKDIR /cardano CMD ["/bin/bash", "-c", "start-relay.sh"] diff --git a/Dockerfiles/submit/Dockerfile b/Dockerfiles/submit/Dockerfile index 8555c81..ac0b320 100644 --- a/Dockerfiles/submit/Dockerfile +++ b/Dockerfiles/submit/Dockerfile @@ -11,16 +11,10 @@ ARG ARCHITECTURE ARG NODE_TAG RUN git clone https://github.com/input-output-hk/cardano-node WORKDIR /root/cardano-node -RUN git checkout ${NODE_TAG} -RUN git submodule update --init --recursive +RUN git checkout ${NODE_TAG} && git submodule update --init --recursive -# Add cabal config files -COPY files/cabal.project.local /root/cardano-node/cabal.project.local - -# Build cardano-node binary -RUN cabal update -RUN cabal user-config update -RUN cabal build exe:cardano-submit-api --disable-tests +# Build cardano-submit binary +RUN cabal update && cabal build exe:cardano-submit-api --disable-tests # Create files structure RUN mkdir -p /cardano/config /cardano/bin /cardano/db /cardano/socket /cardano/scripts @@ -31,14 +25,8 @@ RUN cp -p dist-newstyle/build/${ARCHITECTURE}-linux/${GHC_VERSION}/cardano-submi # Add startup scripts COPY files/start.sh /cardano/scripts/start.sh -# Creating non root user cardano -#RUN useradd -m cardano - # Add permissions -#RUN chown -R cardano:cardano /cardano -RUN chmod g+s /cardano -RUN chmod 540 /cardano/scripts/* -RUN chmod 540 /cardano/bin/* +RUN chmod g+s /cardano && chmod 540 /cardano/scripts/* && chmod 540 /cardano/bin/* ENV PATH=/cardano/scripts:/cardano/bin:$PATH @@ -51,9 +39,9 @@ RUN cabal clean &&\ rm -rf .cabal .local .ghcup .ghc .cache ghcup &&\ rustup self uninstall -y &&\ apt-get purge -y apt-utils git wget pkg-config libgmp-dev \ - libssl-dev libtinfo-dev libsystemd-dev liblmdb-dev libtool \ - zlib1g-dev llvm-14 build-essential libffi-dev automake \ - make g++ libncursesw5 jq autoconf &&\ + libssl-dev libtinfo-dev libsystemd-dev liblmdb-dev libtool \ + zlib1g-dev llvm-dev build-essential libffi-dev automake \ + make g++ libncursesw5 jq autoconf &&\ apt-get autoremove -y &&\ apt-get clean &&\ apt-get autoclean @@ -66,8 +54,6 @@ ENV CARDANO_NODE_SOCKET_PATH=/cardano/socket/node.sock ENV LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" ENV PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" -# Switch user -#USER cardano:cardano WORKDIR /cardano CMD ["/bin/bash", "-c", "start.sh"] diff --git a/Dockerfiles/submit/files/cabal.project.local b/Dockerfiles/submit/files/cabal.project.local deleted file mode 100644 index f585f12..0000000 --- a/Dockerfiles/submit/files/cabal.project.local +++ /dev/null @@ -1,3 +0,0 @@ -jobs: 4 -package cardano-crypto-praos - flags: +external-libsodium-vrf diff --git a/README.md b/README.md index 3991d06..7207918 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Docker files for setting up Cardano Node environment. ### Building from source -Since we need our binary to work on Aarch64 architecture, you'll need to build the node from the source files. +Since we need our binary to work on aarch64 architecture, you'll need to build the node from the source files. I've written a Dockerfile that simplify the process. First, you need to build all required images: From f6345a070ca780e0c62b421003512a5b50eb0024 Mon Sep 17 00:00:00 2001 From: pascallapointe <3847945+pascallapointe@users.noreply.github.com> Date: Sun, 29 Sep 2024 15:27:22 -0400 Subject: [PATCH 6/6] Updated README.md. --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 7207918..6d98747 100644 --- a/README.md +++ b/README.md @@ -63,8 +63,6 @@ First, you need to build all required images: -t cardano_node:${NODE_TAG} Dockerfiles/node ``` - ** Tip: Prepend `docker buildx build --platform=linux/amd64` to build for **amd64**. - 6. The submit api image: ```bash