Merge branch 'EntireTwix:main' into main

This commit is contained in:
Expand-sys 2022-11-21 15:28:09 +11:00 committed by GitHub
commit 89448a4b12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions

View file

@ -75,7 +75,7 @@ endif()
if(DEFINED RETURN_ON_DEL_NAME) if(DEFINED RETURN_ON_DEL_NAME)
set(RETURN_ON_DEL_VAL true) set(RETURN_ON_DEL_VAL true)
set(RETURN_ON_DEL_NAME_VAL "\"" + ${RETURN_ON_DEL_NAME} + "\"") set(RETURN_ON_DEL_NAME_VAL "\""${RETURN_ON_DEL_NAME}"\"")
else() else()
set(RETURN_ON_DEL_VAL false) set(RETURN_ON_DEL_VAL false)
set(RETURN_ON_DEL_NAME_VAL "\"\"") set(RETURN_ON_DEL_NAME_VAL "\"\"")

View file

@ -15,5 +15,4 @@ RUN make -j$(nproc)
ARG ADMIN_A=admin ARG ADMIN_A=admin
ARG SAVE_FREQ=2 ARG SAVE_FREQ=2
RUN ["sh", "-c", "/CCash/config/ssl.sh && /CCash/build/bank"]
CMD ["sh", "-c", "/CCash/config/ssl.sh && /CCash/build/bank ${ADMIN_A} ${SAVE_FREQ}"] CMD ["sh", "-c", "/CCash/config/ssl.sh && /CCash/build/bank ${ADMIN_A} ${SAVE_FREQ}"]