Skip to content

Commit e5c0663

Browse files
foxziylobankov
authored andcommitted
Use ROCKS_INSTALLER in centos_7 and ubuntu_20.04 Dockerfiles
Add facility to set an alternative rocks installer in centos_7 and ubuntu_20.04 Dockerfiles.
1 parent cedd3ee commit e5c0663

File tree

2 files changed

+31
-29
lines changed

2 files changed

+31
-29
lines changed

dockerfiles/centos_7

+16-15
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ FROM centos:7
22
LABEL org.opencontainers.image.authors="[email protected]; [email protected]"
33

44
ARG TNT_VER \
5-
GC64
5+
GC64 \
6+
ROCKS_INSTALLER
67

78
ENV GC64=${GC64:-false} \
89
TARANTOOL_VERSION=${TNT_VER} \
@@ -84,20 +85,20 @@ gpgcheck=0\n" > /etc/yum.repos.d/tarantool_2.repo \
8485
gperftools-libs \
8586
&& ln -s /usr/lib64/libprofiler.so.0 /usr/lib64/libprofiler.so \
8687
&& mkdir -p /rocks \
87-
&& tarantoolctl rocks install lua-term \
88-
&& tarantoolctl rocks install vshard $LUAROCK_VSHARD_VERSION \
89-
&& tarantoolctl rocks install checks $LUAROCK_CHECKS_VERSION \
90-
&& tarantoolctl rocks install avro-schema $LUAROCK_AVRO_SCHEMA_VERSION \
91-
&& tarantoolctl rocks install expirationd $LUAROCK_EXPERATIOND_VERSION \
92-
&& tarantoolctl rocks install queue $LUAROCK_QUEUE_VERSION \
93-
&& tarantoolctl rocks install connpool $LUAROCK_CONNPOOL_VERSION \
94-
&& tarantoolctl rocks install http $LUAROCK_HTTP_VERSION \
95-
&& tarantoolctl rocks install pg $LUAROCK_TARANTOOL_PG_VERSION \
96-
&& tarantoolctl rocks install mysql $LUAROCK_TARANTOOL_MYSQL_VERSION \
97-
&& tarantoolctl rocks install memcached $LUAROCK_MEMCACHED_VERSION \
98-
&& tarantoolctl rocks install metrics $LUAROCK_METRICS_VERSION \
99-
&& tarantoolctl rocks install gis $LUAROCK_TARANTOOL_GIS_VERSION \
100-
&& tarantoolctl rocks install gperftools $LUAROCK_TARANTOOL_GPERFTOOLS_VERSION \
88+
&& ${ROCKS_INSTALLER} install lua-term \
89+
&& ${ROCKS_INSTALLER} install vshard $LUAROCK_VSHARD_VERSION \
90+
&& ${ROCKS_INSTALLER} install checks $LUAROCK_CHECKS_VERSION \
91+
&& ${ROCKS_INSTALLER} install avro-schema $LUAROCK_AVRO_SCHEMA_VERSION \
92+
&& ${ROCKS_INSTALLER} install expirationd $LUAROCK_EXPERATIOND_VERSION \
93+
&& ${ROCKS_INSTALLER} install queue $LUAROCK_QUEUE_VERSION \
94+
&& ${ROCKS_INSTALLER} install connpool $LUAROCK_CONNPOOL_VERSION \
95+
&& ${ROCKS_INSTALLER} install http $LUAROCK_HTTP_VERSION \
96+
&& ${ROCKS_INSTALLER} install pg $LUAROCK_TARANTOOL_PG_VERSION \
97+
&& ${ROCKS_INSTALLER} install mysql $LUAROCK_TARANTOOL_MYSQL_VERSION \
98+
&& ${ROCKS_INSTALLER} install memcached $LUAROCK_MEMCACHED_VERSION \
99+
&& ${ROCKS_INSTALLER} install metrics $LUAROCK_METRICS_VERSION \
100+
&& ${ROCKS_INSTALLER} install gis $LUAROCK_TARANTOOL_GIS_VERSION \
101+
&& ${ROCKS_INSTALLER} install gperftools $LUAROCK_TARANTOOL_GPERFTOOLS_VERSION \
101102
&& : "---------- remove build deps ----------" \
102103
&& rm -rf /rocks \
103104
&& yum -y remove \

dockerfiles/ubuntu_20.04

+15-14
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ FROM ubuntu:20.04
22
LABEL org.opencontainers.image.authors="[email protected]; [email protected]"
33

44
ARG TNT_VER \
5-
GC64
5+
GC64 \
6+
ROCKS_INSTALLER
67

78
ENV GC64=${GC64:-OFF} \
89
TARANTOOL_VERSION=${TNT_VER} \
@@ -52,19 +53,19 @@ RUN set -x \
5253
&& apt -y install tarantool=${TNT_VER} \
5354
&& apt -y install tarantool-dev=${TNT_VER} \
5455
&& apt clean \
55-
&& tarantoolctl rocks install lua-term \
56-
&& tarantoolctl rocks install avro-schema $LUAROCK_AVRO_SCHEMA_VERSION \
57-
&& tarantoolctl rocks install expirationd $LUAROCK_EXPERATIOND_VERSION \
58-
&& tarantoolctl rocks install queue $LUAROCK_QUEUE_VERSION \
59-
&& tarantoolctl rocks install connpool $LUAROCK_CONNPOOL_VERSION \
60-
&& tarantoolctl rocks install vshard $LUAROCK_VSHARD_VERSION \
61-
&& tarantoolctl rocks install http $LUAROCK_HTTP_VERSION \
62-
&& tarantoolctl rocks install pg $LUAROCK_TARANTOOL_PG_VERSION \
63-
&& tarantoolctl rocks install mysql $LUAROCK_TARANTOOL_MYSQL_VERSION \
64-
&& tarantoolctl rocks install memcached $LUAROCK_MEMCACHED_VERSION \
65-
&& tarantoolctl rocks install metrics $LUAROCK_METRICS_VERSION \
66-
&& tarantoolctl rocks install gis $LUAROCK_TARANTOOL_GIS_VERSION \
67-
&& tarantoolctl rocks install gperftools $LUAROCK_TARANTOOL_GPERFTOOLS_VERSION \
56+
&& ${ROCKS_INSTALLER} install lua-term \
57+
&& ${ROCKS_INSTALLER} install avro-schema $LUAROCK_AVRO_SCHEMA_VERSION \
58+
&& ${ROCKS_INSTALLER} install expirationd $LUAROCK_EXPERATIOND_VERSION \
59+
&& ${ROCKS_INSTALLER} install queue $LUAROCK_QUEUE_VERSION \
60+
&& ${ROCKS_INSTALLER} install connpool $LUAROCK_CONNPOOL_VERSION \
61+
&& ${ROCKS_INSTALLER} install vshard $LUAROCK_VSHARD_VERSION \
62+
&& ${ROCKS_INSTALLER} install http $LUAROCK_HTTP_VERSION \
63+
&& ${ROCKS_INSTALLER} install pg $LUAROCK_TARANTOOL_PG_VERSION \
64+
&& ${ROCKS_INSTALLER} install mysql $LUAROCK_TARANTOOL_MYSQL_VERSION \
65+
&& ${ROCKS_INSTALLER} install memcached $LUAROCK_MEMCACHED_VERSION \
66+
&& ${ROCKS_INSTALLER} install metrics $LUAROCK_METRICS_VERSION \
67+
&& ${ROCKS_INSTALLER} install gis $LUAROCK_TARANTOOL_GIS_VERSION \
68+
&& ${ROCKS_INSTALLER} install gperftools $LUAROCK_TARANTOOL_GPERFTOOLS_VERSION \
6869
&& apt purge -y unzip git gcc cmake \
6970
&& apt -y autoremove \
7071
&& rm -rf /var/lib/apt/lists/

0 commit comments

Comments
 (0)