Skip to content

Commit 12927b9

Browse files
committed
Use tarantool image as base instead of centos
Use tarantool image in default Dockerfile for tarantool cartridge container. It will be consistent with Tarantool Container. And also we'll have more flexible version selection Needed for tarantool/cartridge-java#214
1 parent fea46c8 commit 12927b9

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Changelog
22

3+
## [0.5.4] - 2023-03-31
4+
- Use tarantool image as base instead of centos in cartridge container
5+
36
## [0.5.3] - 2022-11-14
47
- Bump logback-classic to 1.3.4 to fix logging
58
- Bump slf4j-api to 2.0.3

src/main/resources/Dockerfile

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM centos:7 AS tarantool-base
2-
ARG TARANTOOL_VERSION=2.8
1+
ARG TARANTOOL_VERSION=2.10.5
2+
FROM tarantool/tarantool:${TARANTOOL_VERSION}-centos7 AS tarantool-base
33
ARG TARANTOOL_SERVER_USER="root"
44
ARG TARANTOOL_SERVER_GROUP="root"
55
ARG TARANTOOL_WORKDIR="/app"
@@ -10,8 +10,7 @@ ENV TARANTOOL_WORKDIR=$TARANTOOL_WORKDIR
1010
ENV TARANTOOL_RUNDIR=$TARANTOOL_RUNDIR
1111
ENV TARANTOOL_DATADIR=$TARANTOOL_DATADIR
1212
ENV TARANTOOL_INSTANCES_FILE=$TARANTOOL_INSTANCES_FILE
13-
RUN curl -L https://tarantool.io/installer.sh | VER=$TARANTOOL_VERSION /bin/bash -s -- --repo-only && \
14-
yum -y install cmake make gcc gcc-c++ git unzip tarantool tarantool-devel cartridge-cli && \
13+
RUN yum -y install cmake make gcc gcc-c++ git unzip cartridge-cli && \
1514
yum clean all
1615
RUN groupadd $TARANTOOL_SERVER_GROUP && useradd -m -s /bin/bash $TARANTOOL_SERVER_USER || true
1716
USER $TARANTOOL_SERVER_USER:$TARANTOOL_SERVER_GROUP

0 commit comments

Comments
 (0)