Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add curl for rocks installations
Browse files Browse the repository at this point in the history
Added curl and git packages for run time to be able to install rocks
without additional dependences.

Also added curl-dev package to build time of the image. It helped to
avoid of local build of the curl from sources of version 5.59.0 due
to alpine OS has the following curl default packages:
alpine 3.5: curl 7.61.1-r1
alpine 3.9: curl 7.64.0-r3

After build for curl from sources became unneeded, the dockerfiles
alpine_3.5_2.x and alpine_3.9 became the same and were merged.

All builds for Tarantool 2.x except 2.1.0 based on alpine 3.5 version
moved to use 3.9 version.

Removed installation of tarantool_curl rock from alpine_3.5_1.x
dockerfile, so alpine_3.5_* dockerfiles became the same and were
merged into alpine_3.5.

Closes #168
Part of #152
avtikhon committed Jul 15, 2020
1 parent 1d3083b commit 96954ab
Showing 14 changed files with 52 additions and 322 deletions.
30 changes: 10 additions & 20 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -40,7 +40,6 @@ before_script:
DIST: '3.5'
TAG: '1.10.0'
VER: '1.10.0'
DOCKERFILE_NAME_SUFFIX: '1.x'
PORT: 5101

'alpine 3.5 1.10.1':
@@ -50,7 +49,6 @@ before_script:
DIST: '3.5'
TAG: '1.10.1'
VER: '1.10.1'
DOCKERFILE_NAME_SUFFIX: '1.x'
PORT: 5101

'alpine 3.5 1.10.2':
@@ -60,7 +58,6 @@ before_script:
DIST: '3.5'
TAG: '1.10.2'
VER: '1.10.2'
DOCKERFILE_NAME_SUFFIX: '1.x'
PORT: 5102

'alpine 3.5 1.10.3':
@@ -70,7 +67,6 @@ before_script:
DIST: '3.5'
TAG: '1.10.3'
VER: '1.10.3'
DOCKERFILE_NAME_SUFFIX: '1.x'
PORT: 5103

'alpine 3.9 1.10.4':
@@ -122,27 +118,24 @@ before_script:
DIST: '3.5'
TAG: '2.1.0'
VER: '2.1.0'
DOCKERFILE_NAME_SUFFIX: '2.x'
PORT: 5211

'alpine 3.5 2.1.1':
'alpine 3.9 2.1.1':
<<: *build_definition
variables:
OS: 'alpine'
DIST: '3.5'
DIST: '3.9'
TAG: '2.1.1'
VER: '2.1.1'
DOCKERFILE_NAME_SUFFIX: '2.x'
PORT: 5211

'alpine 3.5 2.1.2':
'alpine 3.9 2.1.2':
<<: *build_definition
variables:
OS: 'alpine'
DIST: '3.5'
DIST: '3.9'
TAG: '2.1.2'
VER: '2.1.2'
DOCKERFILE_NAME_SUFFIX: '2.x'
PORT: 5212

'alpine 3.9 2.1.3':
@@ -167,24 +160,22 @@ before_script:

# Tarantool branch 2.2

'alpine 3.5 2.2.0':
'alpine 3.9 2.2.0':
<<: *build_definition
variables:
OS: 'alpine'
DIST: '3.5'
DIST: '3.9'
TAG: '2.2.0'
VER: '2.2.0'
DOCKERFILE_NAME_SUFFIX: '2.x'
PORT: 5220

'alpine 3.5 2.2.1':
'alpine 3.9 2.2.1':
<<: *build_definition
variables:
OS: 'alpine'
DIST: '3.5'
DIST: '3.9'
TAG: '2.2.1'
VER: '2.2.1'
DOCKERFILE_NAME_SUFFIX: '2.x'
PORT: 5221

'alpine 3.9 2.2.2':
@@ -216,14 +207,13 @@ before_script:

# Tarantool branch 2.3

'alpine 3.5 2.3.0':
'alpine 3.9 2.3.0':
<<: *build_definition
variables:
OS: 'alpine'
DIST: '3.5'
DIST: '3.9'
TAG: '2.3.0'
VER: '2.3.0'
DOCKERFILE_NAME_SUFFIX: '2.x'
PORT: 5231

'alpine 3.9 2.3.1':
64 changes: 32 additions & 32 deletions README.md
Original file line number Diff line number Diff line change
@@ -310,7 +310,7 @@ A maintaner is responsible for merging the PR.
Say, we have updated dockerfiles/alpine_3.9_2.x and want to check it:

```sh
$ IMAGE=tarantool/tarantool TAG=2 OS=alpine DIST=3.9 VER=2.x DOCKERFILE_NAME_SUFFIX=2.x \
$ IMAGE=tarantool/tarantool TAG=2 OS=alpine DIST=3.9 VER=2.x DOCKERFILE_NAME_SUFFIX= \
PORT=5200 make -f .gitlab.mk build
$ docker run -it tarantool/tarantool:2
...perform a test...
@@ -320,40 +320,40 @@ $ docker run -it tarantool/tarantool:2

Fixed versions:

| Docker tag | Dockerfile |
| ---------- | ------------------------- |
| 1.10.0 | dockerfile/alpine_3.5_1.x |
| 1.10.1 | dockerfile/alpine_3.5_1.x |
| 1.10.2 | dockerfile/alpine_3.5_1.x |
| 1.10.3 | dockerfile/alpine_3.5_1.x |
| 1.10.4 | dockerfile/alpine_3.9_1.x |
| 1.10.5 | dockerfile/alpine_3.9_1.x |
| 1.10.6 | dockerfile/alpine_3.9_1.x |
| 2.1.0 | dockerfile/alpine_3.5_2.x |
| 2.1.1 | dockerfile/alpine_3.5_2.x |
| 2.1.2 | dockerfile/alpine_3.5_2.x |
| 2.1.3 | dockerfile/alpine_3.9_1.x |
| 2.2.0 | dockerfile/alpine_3.5_2.x |
| 2.2.1 | dockerfile/alpine_3.5_2.x |
| 2.2.2 | dockerfile/alpine_3.9_2.x |
| 2.2.3 | dockerfile/alpine_3.9_2.x |
| 2.3.0 | dockerfile/alpine_3.5_2.x |
| 2.3.1 | dockerfile/alpine_3.9_2.x |
| 2.3.2 | dockerfile/alpine_3.9_2.x |
| 2.4.0 | dockerfile/alpine_3.9_2.x |
| 2.4.1 | dockerfile/alpine_3.9_2.x |
| 2.5.0 | dockerfile/alpine_3.9_2.x |
| Docker tag | Dockerfile |
| ---------- | --------------------- |
| 1.10.0 | dockerfile/alpine_3.5 |
| 1.10.1 | dockerfile/alpine_3.5 |
| 1.10.2 | dockerfile/alpine_3.5 |
| 1.10.3 | dockerfile/alpine_3.5 |
| 1.10.4 | dockerfile/alpine_3.9 |
| 1.10.5 | dockerfile/alpine_3.9 |
| 1.10.6 | dockerfile/alpine_3.9 |
| 2.1.0 | dockerfile/alpine_3.5 |
| 2.1.1 | dockerfile/alpine_3.9 |
| 2.1.2 | dockerfile/alpine_3.9 |
| 2.1.3 | dockerfile/alpine_3.9 |
| 2.2.0 | dockerfile/alpine_3.9 |
| 2.2.1 | dockerfile/alpine_3.9 |
| 2.2.2 | dockerfile/alpine_3.9 |
| 2.2.3 | dockerfile/alpine_3.9 |
| 2.3.0 | dockerfile/alpine_3.9 |
| 2.3.1 | dockerfile/alpine_3.9 |
| 2.3.2 | dockerfile/alpine_3.9 |
| 2.4.0 | dockerfile/alpine_3.9 |
| 2.4.1 | dockerfile/alpine_3.9 |
| 2.5.0 | dockerfile/alpine_3.9 |

Rolling versions:

| Docker tag | Dockerfile |
| ---------- | ------------------------- |
| 1 | dockerfile/alpine_3.9_1.x |
| 2.1 | dockerfile/alpine_3.9_2.2 |
| 2.2 | dockerfile/alpine_3.9_2.x |
| 2.3 | dockerfile/alpine_3.9_2.x |
| 2.4 | dockerfile/alpine_3.9_2.x |
| 2/latest | dockerfile/alpine_3.9_2.x |
| Docker tag | Dockerfile |
| ---------- | --------------------- |
| 1 | dockerfile/alpine_3.9 |
| 2.1 | dockerfile/alpine_3.9 |
| 2.2 | dockerfile/alpine_3.9 |
| 2.3 | dockerfile/alpine_3.9 |
| 2.4 | dockerfile/alpine_3.9 |
| 2/latest | dockerfile/alpine_3.9 |

Special builds:

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
17 changes: 3 additions & 14 deletions dockerfiles/alpine_3.5_1.x → dockerfiles/alpine_3.5
Original file line number Diff line number Diff line change
@@ -13,8 +13,6 @@ ARG TNT_VER
ENV TARANTOOL_VERSION=${TNT_VER} \
TARANTOOL_DOWNLOAD_URL=https://github.com/tarantool/tarantool.git \
TARANTOOL_INSTALL_LUADIR=/usr/local/share/tarantool \
CURL_REPO=https://github.com/curl/curl.git \
CURL_TAG=curl-7_59_0 \
GPERFTOOLS_REPO=https://github.com/gperftools/gperftools.git \
GPERFTOOLS_TAG=gperftools-2.5 \
LUAROCKS_URL=https://github.com/tarantool/luarocks/archive/6e6fe62d9409fe2103c0fd091cccb3da0451faf5.tar.gz \
@@ -28,7 +26,6 @@ ENV TARANTOOL_VERSION=${TNT_VER} \
LUAROCK_METRICS_VERSION=0.2.0 \
LUAROCK_TARANTOOL_PG_VERSION=2.0.2 \
LUAROCK_TARANTOOL_MYSQL_VERSION=2.0.1 \
LUAROCK_TARANTOOL_CURL_VERSION=2.3.1 \
LUAROCK_TARANTOOL_MQTT_VERSION=1.2.1 \
LUAROCK_TARANTOOL_GIS_VERSION=1.0.0 \
LUAROCK_TARANTOOL_PROMETHEUS_VERSION=1.0.4 \
@@ -52,6 +49,8 @@ RUN set -x \
libunwind \
icu \
ca-certificates \
curl \
git \
&& apk add --no-cache --virtual .build-deps \
perl \
gcc \
@@ -75,15 +74,7 @@ RUN set -x \
go \
icu-dev \
wget \
&& : "---------- curl ----------" \
&& mkdir -p /usr/src/curl \
&& git clone "$CURL_REPO" /usr/src/curl \
&& git -C /usr/src/curl checkout "$CURL_TAG" \
&& (cd /usr/src/curl \
&& ./buildconf \
&& ./configure --prefix "/usr/local" \
&& make -j \
&& make install) \
curl-dev \
&& : "---------- gperftools ----------" \
&& mkdir -p /usr/src/gperftools \
&& git clone "$GPERFTOOLS_REPO" /usr/src/gperftools \
@@ -213,8 +204,6 @@ RUN set -x \
&& tarantoolctl rocks install metrics $LUAROCK_METRICS_VERSION \
&& : "prometheus" \
&& tarantoolctl rocks install prometheus $LUAROCK_TARANTOOL_PROMETHEUS_VERSION \
&& : "curl" \
&& tarantoolctl rocks install tarantool-curl $LUAROCK_TARANTOOL_CURL_VERSION \
&& : "mqtt" \
&& tarantoolctl rocks install mqtt $LUAROCK_TARANTOOL_MQTT_VERSION \
&& : "gis" \
Loading

0 comments on commit 96954ab

Please sign in to comment.