diff --git a/images/ci/Dockerfile b/images/ci/Dockerfile index 8bab3e8ac9b81608b18d7f32b9b6558994b5cc06..08c6ea9c89711f8738f1a8406d36a12ceb122e04 100644 --- a/images/ci/Dockerfile +++ b/images/ci/Dockerfile @@ -59,8 +59,6 @@ RUN apk update \ libc-dev \ libev \ libffi \ - # Used by 'scripts/install_dal_trusted_setup.sh' below - curl \ sudo \ sqlite-libs \ # Used by teztale @@ -68,13 +66,6 @@ RUN apk update \ sqlite-dev \ postgresql-dev -# Install dal SRS setup (need curl) -COPY scripts/install_dal_trusted_setup.sh scripts/version.sh /tmp/ -RUN mkdir -p /usr/share/dal-trusted-setup && \ - DAL_TRUSTED_SETUP=/usr/share/dal-trusted-setup \ - sh /tmp/install_dal_trusted_setup.sh && \ - rm /tmp/install_dal_trusted_setup.sh /tmp/version.sh - USER tezos ENV USER=tezos WORKDIR /home/tezos @@ -347,6 +338,13 @@ RUN apk update \ && apk add --no-cache curl git file make jq websocat gcc clang lld \ && apk add --no-cache ca-certificates build-base musl-dev libusb-dev linux-headers procps-ng +# Install dal SRS setup (need curl) +COPY scripts/install_dal_trusted_setup.sh scripts/version.sh /tmp/ +RUN mkdir -p /usr/share/dal-trusted-setup && \ + DAL_TRUSTED_SETUP=/usr/share/dal-trusted-setup \ + sh /tmp/install_dal_trusted_setup.sh && \ + rm /tmp/install_dal_trusted_setup.sh /tmp/version.sh + ## Add npm from 3.21 main repository instead of 3.20 to get a newer version (v22) of nodejs. ## Should solve related hanging problems cf. ## - https://github.com/npm/cli/issues/4028 diff --git a/scripts/dpkg/make_dpkg.sh b/scripts/dpkg/make_dpkg.sh index 94fb4767fd76f09fbcdb014c8dacb82b74fa0e1d..eb588dc694a65c8bcaa917c43ff99dcd061955c2 100755 --- a/scripts/dpkg/make_dpkg.sh +++ b/scripts/dpkg/make_dpkg.sh @@ -129,15 +129,6 @@ for control_file in "$myhome"/*control.in; do "${staging_dir}/usr/share/zcash-params" fi - if [ "$pg" = "dal-node" ]; then - # call the install script to make available the - # zcash parameters on the build host - scripts/install_dal_trusted_setup.sh - zcashParams "${common}/${pg}-zcash" \ - "${staging_dir}/usr/share/dal-trusted-setup" \ - _opam/share/dal-trusted-setup - fi - # Build the package # echo "=> Constructing package ${dpkg_fullname}"