cartridge: bump version to 1.0.0 (#11)

Author: vasiliy-t

examples/kv/Dockerfile

@@ -1,27 +1,22 @@
-FROM centos:centos7
-
-WORKDIR /home/tarantool
-COPY yum-tnt.sh .
-RUN ./yum-tnt.sh
-RUN yum install -y epel-release && \
-	curl --silent --location https://rpm.nodesource.com/setup_8.x | bash - && \
-	yum install -y git make nodejs cmake gcc tarantool tarantool-devel
-
-RUN tarantoolctl rocks install https://raw.githubusercontent.com/rosik/cartridge/master/cartridge-scm-1.rockspec
-COPY key-value-store /home/tarantool/key-value-store
+FROM tarantool/tarantool:1.x-centos7
 
 # Tarantool binary protocol port
 EXPOSE 3301
-
 # Application HTTP API
 EXPOSE 8081
 
-ENV TARANTOOL_WORK_DIR=/tarantool/data \
-    TARANTOOL_RUN_DIR=/tarantool/run \
+ENV TARANTOOL_WORK_DIR=/var/lib/tarantool \
+    TARANTOOL_RUN_DIR=/var/run \
     TARANTOOL_MEMTX_MEMORY=134217728
 
+WORKDIR /opt/tarantool
+RUN yum install -y gcc make cmake git unzip
+
+COPY key-value-store ./
+RUN tarantoolctl rocks make key-value-scm-1.rockspec
+
 COPY ./docker-entrypoint.sh .
 
-ENTRYPOINT ["/home/tarantool/docker-entrypoint.sh"]
+ENTRYPOINT ["/opt/tarantool/docker-entrypoint.sh"]
 
-CMD ["tarantool", "./key-value-store/init.lua"]
+CMD ["tarantool", "/opt/tarantool/init.lua"]

examples/kv/deployment.yaml

@@ -69,9 +69,9 @@ spec:
             value: "1"
       containers:
       - name: pim-storage
-        image: tarantool/tarantool-operator-examples-kv:0.0.1
+        image: tarantool/tarantool-operator-examples-kv:0.0.2
         volumeMounts:
-          - mountPath: "/tarantool/data"
+          - mountPath: "/var/lib/tarantool"
             name: www
         ports:
           - containerPort: 3301
@@ -82,11 +82,11 @@ spec:
               fieldRef:
                 fieldPath: metadata.name
           - name: TARANTOOL_WORK_DIR
-            value: "/tarantool/data"
+            value: "/var/lib/tarantool"
           - name: TARANTOOL_MEMTX_MEMORY
             value: "33554432"
           - name: TARANTOOL_LOG
-            value: "/tarantool/data/storage.log"
+            value: "/dev/stdout"
           - name: TARANTOOL_ADVERTISE_HOST
             valueFrom:
               fieldRef:
@@ -128,9 +128,9 @@ spec:
             value: "1"
       containers:
       - name: pim-router
-        image: tarantool/tarantool-operator-examples-kv:0.0.1
+        image: tarantool/tarantool-operator-examples-kv:0.0.2
         volumeMounts:
-          - mountPath: "/tarantool/data"
+          - mountPath: "/var/lib/tarantool"
             name: www
         ports:
           - containerPort: 3301
@@ -141,11 +141,11 @@ spec:
               fieldRef:
                 fieldPath: metadata.name
           - name: TARANTOOL_WORK_DIR
-            value: "/tarantool/data"
+            value: "/var/lib/tarantool"
           - name: TARANTOOL_MEMTX_MEMORY
             value: "33554432"
           - name: TARANTOOL_LOG
-            value: "/tarantool/data/storage.log"
+            value: "/dev/stdout"
           - name: TARANTOOL_ADVERTISE_HOST
             valueFrom:
               fieldRef:

examples/kv/docker-entrypoint.sh

@@ -13,8 +13,4 @@ fi
 
 mkdir -p $TARANTOOL_WORK_DIR $TARANTOOL_LOG_DIR $TARANTOOL_RUN_DIR
 
-export PATH=/home/tarantool/tarantool-enterprise:$PATH
-
-cd /home/tarantool
-
 exec "$@"

examples/kv/key-value-store/key-value-scm-1.rockspec

@@ -8,7 +8,8 @@ source  = {
 dependencies = {
     'tarantool',
     'lua >= 5.1',
-    'cartridge',
+    'checks == 3.0.1-1',
+    'cartridge == 1.0.0-1',
 }
 
 build = {