Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Build meesign helper
FROM maven:3-jdk-11 AS java-builder
WORKDIR /
RUN git clone https://github.com/dufkan/meesign-helper.git meesign-helper
RUN git clone https://github.com/crocs-muni/meesign-helper.git meesign-helper
RUN cd meesign-helper && mvn clean compile assembly:single


Expand Down
5 changes: 4 additions & 1 deletion compose.deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ services:
# context: .
# dockerfile: Dockerfile
networks:
- meesign-network
meesign-network:
aliases:
- meesign.local

ports:
- 1337:1337
restart: unless-stopped
Expand Down
6 changes: 4 additions & 2 deletions integration-tests/Dockerfile.test_client
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RUN apt install --yes \
sqlite3 \
poppler-utils \
protobuf-compiler \
cargo
clang
RUN ln -s /usr/lib/x86_64-linux-gnu/libsqlite3.so.0 /usr/lib/x86_64-linux-gnu/libsqlite3.so

RUN groupadd --gid 1234 test-group
Expand All @@ -15,6 +15,9 @@ RUN chown --recursive test-client:test-group /app

USER test-client

RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=1.91.1
ENV PATH="/home/test-client/.cargo/bin:${PATH}"

ARG MEESIGN_TEST_CLIENT_REPO_OWNER=crocs-muni
ARG MEESIGN_TEST_CLIENT_REPO_BRANCH=devel
RUN git clone \
Expand All @@ -29,7 +32,6 @@ RUN cd meesign_native/native/meesign-crypto && cargo build --release --target x8
WORKDIR /app/meesign-client/meesign_core
RUN dart pub get

# TODO add test user account?
ENV LD_LIBRARY_PATH="/usr/lib/x86_64-linux-gnu/:/app/meesign-client/meesign_native/native/meesign-crypto/target/x86_64-unknown-linux-gnu/release/"
ENV MEESIGN_SERVER_DOMAIN=meesign-server
ENV MEESIGN_SERVER_PORT=1337
Expand Down
Loading