diff --git a/CHANGELOG.md b/CHANGELOG.md index b899254..2d0e54b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## [0.5.4] - 2023-03-31 +- Use tarantool image as base instead of centos in cartridge container + ## [0.5.3] - 2022-11-14 - Bump logback-classic to 1.3.4 to fix logging - Bump slf4j-api to 2.0.3 diff --git a/src/main/resources/Dockerfile b/src/main/resources/Dockerfile index d25d795..64033b9 100644 --- a/src/main/resources/Dockerfile +++ b/src/main/resources/Dockerfile @@ -1,5 +1,5 @@ -FROM centos:7 AS tarantool-base -ARG TARANTOOL_VERSION=2.8 +ARG TARANTOOL_VERSION=2.10.5 +FROM tarantool/tarantool:${TARANTOOL_VERSION}-centos7 AS tarantool-base ARG TARANTOOL_SERVER_USER="root" ARG TARANTOOL_SERVER_GROUP="root" ARG TARANTOOL_WORKDIR="/app" @@ -10,8 +10,7 @@ ENV TARANTOOL_WORKDIR=$TARANTOOL_WORKDIR ENV TARANTOOL_RUNDIR=$TARANTOOL_RUNDIR ENV TARANTOOL_DATADIR=$TARANTOOL_DATADIR ENV TARANTOOL_INSTANCES_FILE=$TARANTOOL_INSTANCES_FILE -RUN curl -L https://tarantool.io/installer.sh | VER=$TARANTOOL_VERSION /bin/bash -s -- --repo-only && \ - yum -y install cmake make gcc gcc-c++ git unzip tarantool tarantool-devel cartridge-cli && \ +RUN yum -y install cmake make gcc gcc-c++ git unzip cartridge-cli && \ yum clean all RUN groupadd $TARANTOOL_SERVER_GROUP && useradd -m -s /bin/bash $TARANTOOL_SERVER_USER || true USER $TARANTOOL_SERVER_USER:$TARANTOOL_SERVER_GROUP