HiveClone
/
hive
mirror of https://gitlab.syncad.com/hive/hive.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplified Dockerfile definition by elimination of BLOCK_LOG_SUFFIX parameter (replaced by COPY --from=block_log_5m_source in case of data image build)

This commit is contained in:
Bartek Wrona 2022-11-11 00:52:56 +01:00
parent 594d089895
commit 3161905879
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Dockerfile
View File

@ -3,8 +3,6 @@
# To be started from cloned haf source directory.
ARG CI_REGISTRY_IMAGE=registry.gitlab.syncad.com/hive/hive/
ARG CI_IMAGE_TAG=:ubuntu20.04-5
ARG BLOCK_LOG_SUFFIX
ARG BUILD_IMAGE_TAG
FROM phusion/baseimage:focal-1.0.0 AS runtime
@ -78,9 +76,9 @@ RUN \
find . -name *.a -type f -delete
# Here we could use a smaller image without packages specific to build requirements
FROM ${CI_REGISTRY_IMAGE}ci-base-image$BLOCK_LOG_SUFFIX$CI_IMAGE_TAG as base_instance
FROM ${CI_REGISTRY_IMAGE}ci-base-image$CI_IMAGE_TAG as base_instance
ENV BUILD_IMAGE_TAG=${BUILD_IMAGE_TAG:-:ubuntu20.04-4}
ENV BUILD_IMAGE_TAG=${BUILD_IMAGE_TAG}
ARG P2P_PORT=2001
ENV P2P_PORT=${P2P_PORT}
@ -122,7 +120,7 @@ STOPSIGNAL SIGINT
ENTRYPOINT [ "/home/hived/docker_entrypoint.sh" ]
FROM ${CI_REGISTRY_IMAGE}base_instance$BLOCK_LOG_SUFFIX:base_instance-${BUILD_IMAGE_TAG} as instance
FROM ${CI_REGISTRY_IMAGE}base_instance:base_instance-${BUILD_IMAGE_TAG} as instance
#p2p service
EXPOSE ${P2P_PORT}
@ -133,8 +131,11 @@ EXPOSE ${HTTP_PORT}
# Port specific to HTTP cli_wallet server
EXPOSE ${CLI_WALLET_PORT}
FROM ${CI_REGISTRY_IMAGE}instance-5m:instance-${BUILD_IMAGE_TAG} as data
FROM ${CI_REGISTRY_IMAGE}ci-base-image-5m$CI_IMAGE_TAG AS block_log_5m_source
FROM ${CI_REGISTRY_IMAGE}base_instance:base_instance-$BUILD_IMAGE_TAG as data
COPY --from=block_log_5m_source /home/hived/datadir /home/hived/datadir
ADD --chown=hived:hived ./docker/config_5M.ini /home/hived/datadir/config.ini
RUN "/home/hived/docker_entrypoint.sh" --force-replay --stop-replay-at-block=5000000 --exit-before-sync