Dockerfile fix

This commit is contained in:
2023-03-10 02:16:28 -04:00
parent 001bebe75a
commit f02ec2cad2
12 changed files with 166 additions and 99 deletions

View File

@@ -12,7 +12,7 @@ FROM debian:bullseye AS updated-debian
SHELL ["/bin/bash", "-exo", "pipefail", "-c"]
LABEL name="BitDeals Module"
EXPOSE 4999 80
EXPOSE 4999/tcp 80/tcp
## Debian update; install dependencies
ARG DEBIAN_FRONTEND=noninteractive
@@ -80,15 +80,16 @@ RUN su -l --shell /bin/bash $UNAME -c 'cd '$UHOME' ; \
./configure ; \
cd cmake-build-release ; \
make' ; \
git config --global --add safe.directory $UHOME/apostol-dm ;\
cd $UHOME/apostol-dm/cmake-build-release ;\
make install
## Download "build" directory from web-dm repository
## Download "build" directory from web-build repository
RUN su -l --shell /bin/bash $UNAME -c 'cd '$UHOME' ; \
mkdir web-dm ;\
cd web-dm ;\
mkdir web-build ;\
cd web-build ;\
git init ;\
git remote add -f origin https://git.bitdeals.org/private/web-dm/ ;\
git remote add -f origin https://git.bitdeals.org/private/web-build/ ;\
echo build >> .git/info/sparse-checkout ;\
git pull origin master'
@@ -104,7 +105,7 @@ COPY --from=development /usr/local/ /usr/local/
COPY --from=development /etc/dm/ /etc/dm/
COPY --from=development /usr/sbin/dm /usr/sbin/dm
COPY --from=development /etc/init.d/dm /etc/init.d/dm
COPY --from=development --chown=www-data:www-data $UHOME/web-dm/build /var/www/web
COPY --from=development --chown=www-data:www-data $UHOME/web-build/build /var/www/web
COPY --from=development --chown=$UNAME:$UNAME $UHOME/apostol-dm/docker/bitdeals-test.asc /etc/dm/bitdeals-test.asc
#COPY --from=development --chown=$UNAME:$UNAME $UHOME/apostol-dm/docker/bitdeals.asc /etc/dm/bitdeals.asc
COPY --from=development $UHOME/apostol-dm/docker/entrypoint.sh /entrypoint.sh