Merge branch 'release/1.2.4' into master

# Conflicts:
#	CMakeLists.txt
#	Dockerfile.micord
#	entrypoint.sh
#	src/modules/service_sign.c
This commit is contained in:
Наиля Алашкова 2025-02-19 09:06:44 +03:00
parent a2cb8f6487
commit e351409288
4 changed files with 13 additions and 25 deletions

View file

@ -51,20 +51,6 @@ COPY --from=builder /opt/cprocsp /opt/cprocsp
COPY --from=builder /var/opt/cprocsp /var/opt/cprocsp
COPY --from=builder /build/.build/ervu-sign-module /opt/ervu-sign-module/ervu-sign-module
#VOLUME /var/opt/cprocsp/keys/ervu/7h96bfno.000
EXPOSE 9009
COPY --chown=$RUNTIME_USER:$RUNTIME_USER conf/cacerts /cacerts
COPY --chown=$RUNTIME_USER:$RUNTIME_USER conf/certs /certs
RUN echo "Installing CA certificates" \
&& /opt/cprocsp/sbin/amd64/cryptsrv \
&& find /cacerts -regex ".*\.\(cer\|crt\)$" -exec /opt/cprocsp/bin/amd64/certmgr -install -store mRoot -file {} \;
RUN echo "Installing certificates" \
&& /opt/cprocsp/sbin/amd64/cryptsrv \
&& su -c 'find /certs -regex ".*\.\(cer\|crt\)$" -exec /opt/cprocsp/bin/amd64/certmgr -install -file {} \;' $RUNTIME_USER
ENTRYPOINT ["/entrypoint.sh"]