Skip to content

Commit 5ad4d6b

Browse files
committed
test: fix crud tests
1 parent f7595bd commit 5ad4d6b

File tree

4 files changed

+55
-2
lines changed

4 files changed

+55
-2
lines changed

tarantool-client/src/test/java/io/tarantool/client/integration/TarantoolCrudClientTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public static void setUp() throws Exception {
145145
} else {
146146
cartridgeContainer =
147147
new TarantoolCartridgeContainer(
148-
"Dockerfile",
148+
"cartridge/Dockerfile",
149149
dockerRegistry + "cartridge",
150150
"cartridge/instances.yml",
151151
"cartridge/replicasets.yml",

tarantool-client/src/test/java/io/tarantool/client/integration/TarantoolCrudClientWithRetryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ private void execute() {
8484

8585
private static final TarantoolCartridgeContainer tt =
8686
new TarantoolCartridgeContainer(
87-
"Dockerfile",
87+
"cartridge/Dockerfile",
8888
System.getenv().getOrDefault("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX", "")
8989
+ "cartridge",
9090
"cartridge/instances.yml",
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
ARG IMAGE="tarantool/tarantool"
2+
ARG TARANTOOL_VERSION="2.11.8-ubuntu20.04"
3+
FROM $IMAGE:$TARANTOOL_VERSION AS cartridge-base
4+
5+
ARG TARANTOOL_SERVER_USER="root"
6+
ARG TARANTOOL_SERVER_GROUP="root"
7+
USER $TARANTOOL_SERVER_USER:$TARANTOOL_SERVER_GROUP
8+
RUN groupadd $TARANTOOL_SERVER_GROUP && useradd -m -s /bin/bash $TARANTOOL_SERVER_USER || true
9+
10+
# install dependencies
11+
RUN ulimit -n 1024 && \
12+
apt-get -y update && \
13+
apt-get -y install build-essential cmake make gcc git unzip cartridge-cli && \
14+
apt-get -y clean
15+
RUN cartridge version
16+
17+
# build and run
18+
FROM cartridge-base AS cartridge-app
19+
ARG CARTRIDGE_SRC_DIR="cartridge"
20+
ARG TARANTOOL_WORKDIR="/app"
21+
ARG TARANTOOL_RUNDIR="/tmp/run"
22+
ARG TARANTOOL_DATADIR="/tmp/data"
23+
ARG TARANTOOL_LOGDIR="/tmp/log"
24+
ARG TARANTOOL_INSTANCES_FILE="./instances.yml"
25+
ARG TARANTOOL_CLUSTER_COOKIE
26+
ARG START_DELAY="5s"
27+
ENV START_DELAY=$START_DELAY
28+
ENV TARANTOOL_WORKDIR=$TARANTOOL_WORKDIR
29+
ENV TARANTOOL_RUNDIR=$TARANTOOL_RUNDIR
30+
ENV TARANTOOL_DATADIR=$TARANTOOL_DATADIR
31+
ENV TARANTOOL_LOGDIR=$TARANTOOL_LOGDIR
32+
ENV TARANTOOL_INSTANCES_FILE=$TARANTOOL_INSTANCES_FILE
33+
ENV TARANTOOL_CLUSTER_COOKIE=$TARANTOOL_CLUSTER_COOKIE
34+
ENV CMAKE_DUMMY_WEBUI="YES"
35+
COPY $CARTRIDGE_SRC_DIR $TARANTOOL_WORKDIR
36+
WORKDIR $TARANTOOL_WORKDIR
37+
38+
RUN rm -rf .rocks && cartridge build --verbose
39+
40+
RUN echo 'if [ -z "$TARANTOOL_CLUSTER_COOKIE" ]; then unset TARANTOOL_CLUSTER_COOKIE ; fi ; \
41+
sleep $START_DELAY && cartridge start --run-dir=$TARANTOOL_RUNDIR --data-dir=$TARANTOOL_DATADIR \
42+
--log-dir=$TARANTOOL_LOGDIR --cfg=$TARANTOOL_INSTANCES_FILE' > run.sh && chmod +x run.sh
43+
CMD ./run.sh
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
box.cfg {
2+
listen = 3301,
3+
memtx_memory = 128 * 1024 * 1024, -- 128 Mb
4+
-- log = 'file:/tmp/tarantool.log',
5+
log_level = 6,
6+
}
7+
-- API user will be able to login with this password
8+
box.schema.user.create('api_user', { password = 'secret', if_not_exists = true })
9+
-- API user will be able to create spaces, add or remove data, execute functions
10+
box.schema.user.grant('api_user', 'read,write,execute', 'universe', nil, { if_not_exists = true })

0 commit comments

Comments
 (0)