Skip to content

Commit

Permalink
Update versions for tarantool modules
Browse files Browse the repository at this point in the history
This patch updates the version for each tarantool module to the latest
tag of the module where it's possible.

Also, a build issue was fixed for Centos 7. It was impossible to
download the pgdg-redhat-repo-latest.noarch.rpm package by the link
from the docker file. So the link was updated.

Clases #208
Closes #215
  • Loading branch information
ylobankov committed Dec 7, 2021
1 parent 54d1677 commit 750c06c
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 15 deletions.
14 changes: 7 additions & 7 deletions dockerfiles/alpine_3.9
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ ENV TARANTOOL_VERSION=${TNT_VER} \
GPERFTOOLS_REPO=https://github.com/gperftools/gperftools.git \
GPERFTOOLS_TAG=gperftools-2.5 \
LUAROCKS_URL=https://github.com/tarantool/luarocks/archive/6e6fe62d9409fe2103c0fd091cccb3da0451faf5.tar.gz \
LUAROCK_VSHARD_VERSION=0.1.14 \
LUAROCK_AVRO_SCHEMA_VERSION=3.0.3 \
LUAROCK_EXPERATIOND_VERSION=1.0.1 \
LUAROCK_QUEUE_VERSION=1.0.6 \
LUAROCK_VSHARD_VERSION=0.1.18 \
LUAROCK_AVRO_SCHEMA_VERSION=3.0.6 \
LUAROCK_EXPERATIOND_VERSION=1.1.1 \
LUAROCK_QUEUE_VERSION=1.1.0 \
LUAROCK_CONNPOOL_VERSION=1.1.1 \
LUAROCK_HTTP_VERSION=1.1.0 \
LUAROCK_HTTP_VERSION=1.2.0 \
LUAROCK_MEMCACHED_VERSION=1.0.1 \
LUAROCK_METRICS_VERSION=0.10.0 \
LUAROCK_METRICS_VERSION=0.12.0 \
LUAROCK_TARANTOOL_PG_VERSION=2.0.2 \
LUAROCK_TARANTOOL_MYSQL_VERSION=2.0.1 \
LUAROCK_TARANTOOL_MQTT_VERSION=1.2.1 \
LUAROCK_TARANTOOL_MQTT_VERSION=1.5.0 \
LUAROCK_TARANTOOL_GIS_VERSION=1.0.0 \
LUAROCK_TARANTOOL_PROMETHEUS_VERSION=1.0.4 \
LUAROCK_TARANTOOL_GPERFTOOLS_VERSION=1.0.1
Expand Down
15 changes: 7 additions & 8 deletions dockerfiles/centos_7
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,14 @@ ENV TARANTOOL_VERSION=${TNT_VER} \
TARANTOOL_DOWNLOAD_URL=https://github.com/tarantool/tarantool.git \
TARANTOOL_INSTALL_LUADIR=/usr/local/share/tarantool \
LUAROCKS_URL=https://github.com/tarantool/luarocks/archive/6e6fe62d9409fe2103c0fd091cccb3da0451faf5.tar.gz \
LUAROCK_VSHARD_VERSION=0.1.14 \
LUAROCK_CHECKS_VERSION=3.0.1 \
LUAROCK_AVRO_SCHEMA_VERSION=3.0.3 \
LUAROCK_EXPERATIOND_VERSION=1.0.1 \
LUAROCK_QUEUE_VERSION=1.0.6 \
LUAROCK_VSHARD_VERSION=0.1.18 \
LUAROCK_AVRO_SCHEMA_VERSION=3.0.6 \
LUAROCK_EXPERATIOND_VERSION=1.1.1 \
LUAROCK_QUEUE_VERSION=1.1.0 \
LUAROCK_CONNPOOL_VERSION=1.1.1 \
LUAROCK_HTTP_VERSION=1.1.0 \
LUAROCK_HTTP_VERSION=1.2.0 \
LUAROCK_MEMCACHED_VERSION=1.0.1 \
LUAROCK_METRICS_VERSION=0.10.0 \
LUAROCK_METRICS_VERSION=0.12.0 \
LUAROCK_TARANTOOL_PG_VERSION=2.0.2 \
LUAROCK_TARANTOOL_MYSQL_VERSION=2.0.1 \
LUAROCK_TARANTOOL_GIS_VERSION=1.0.0 \
Expand Down Expand Up @@ -140,7 +139,7 @@ COPY files/luarocks-config_centos.lua /usr/local/etc/luarocks/config-5.1.lua
COPY files/luarocks-config.lua /usr/local/etc/tarantool/rocks/config-5.1.lua

RUN set -x \
&& yum -y install https://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm \
&& yum -y install https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm \
&& yum -y install \
mariadb-libs \
postgresql96-libs \
Expand Down

0 comments on commit 750c06c

Please sign in to comment.