Add curl for rocks installations

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 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
tarantool · Aug 6, 2020 · cd15edb · cd15edb
1 parent da6d177
commit cd15edb
Show file tree

Hide file tree

Showing 14 changed files with 36 additions and 314 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -40,7 +40,6 @@ before_script:
     DIST: '3.5'
     TAG: '1.10.0'
     VER: '1.10.0'
-    DOCKERFILE_NAME_SUFFIX: '1.x'
     PORT: 5101
     ENABLE_BUNDLED_LIBYAML: 'OFF'
 
@@ -51,7 +50,6 @@ before_script:
     DIST: '3.5'
     TAG: '1.10.1'
     VER: '1.10.1'
-    DOCKERFILE_NAME_SUFFIX: '1.x'
     PORT: 5101
     ENABLE_BUNDLED_LIBYAML: 'OFF'
 
@@ -62,7 +60,6 @@ before_script:
     DIST: '3.5'
     TAG: '1.10.2'
     VER: '1.10.2'
-    DOCKERFILE_NAME_SUFFIX: '1.x'
     PORT: 5102
     ENABLE_BUNDLED_LIBYAML: 'OFF'
 
@@ -73,7 +70,6 @@ before_script:
     DIST: '3.5'
     TAG: '1.10.3'
     VER: '1.10.3'
-    DOCKERFILE_NAME_SUFFIX: '1.x'
     PORT: 5103
     ENABLE_BUNDLED_LIBYAML: 'OFF'
 
@@ -129,7 +125,6 @@ before_script:
     DIST: '3.5'
     TAG: '2.1.0'
     VER: '2.1.0'
-    DOCKERFILE_NAME_SUFFIX: '2.x'
     PORT: 5211
     ENABLE_BUNDLED_LIBYAML: 'OFF'
 
@@ -140,7 +135,6 @@ before_script:
     DIST: '3.5'
     TAG: '2.1.1'
     VER: '2.1.1'
-    DOCKERFILE_NAME_SUFFIX: '2.x'
     PORT: 5211
     ENABLE_BUNDLED_LIBYAML: 'OFF'
 
@@ -151,7 +145,6 @@ before_script:
     DIST: '3.5'
     TAG: '2.1.2'
     VER: '2.1.2'
-    DOCKERFILE_NAME_SUFFIX: '2.x'
     PORT: 5212
     ENABLE_BUNDLED_LIBYAML: 'OFF'
 
@@ -186,7 +179,6 @@ before_script:
     DIST: '3.5'
     TAG: '2.2.0'
     VER: '2.2.0'
-    DOCKERFILE_NAME_SUFFIX: '2.x'
     PORT: 5220
     ENABLE_BUNDLED_LIBYAML: 'OFF'
 
@@ -197,7 +189,6 @@ before_script:
     DIST: '3.5'
     TAG: '2.2.1'
     VER: '2.2.1'
-    DOCKERFILE_NAME_SUFFIX: '2.x'
     PORT: 5221
 
 'alpine 3.9 2.2.2':
@@ -236,7 +227,6 @@ before_script:
     DIST: '3.5'
     TAG: '2.3.0'
     VER: '2.3.0'
-    DOCKERFILE_NAME_SUFFIX: '2.x'
     PORT: 5231
 
 'alpine 3.9 2.3.1':

diff --git a/README.md b/README.md
@@ -310,7 +310,8 @@ A maintaner is responsible for merging the PR.
 Say, we have updated 'dockerfiles/alpine_3.9' and want to check it:
 
 ```sh
-$ TAG=2 OS=alpine DIST=3.9 VER=2.x PORT=5200 make -f .gitlab.mk build
+$ IMAGE=tarantool/tarantool TAG=2 OS=alpine DIST=3.9 VER=2.x \
+        PORT=5200 make -f .gitlab.mk build
 $ docker run -it tarantool/tarantool:2
 ...perform a test...
 ```
@@ -319,29 +320,29 @@ $ 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.10.5     | dockerfile/alpine_3.9     |
-| 1.10.6     | dockerfile/alpine_3.9     |
-| 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     |
-| 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.2.3      | dockerfile/alpine_3.9     |
-| 2.3.0      | dockerfile/alpine_3.5_2.x |
-| 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     |
+| 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.5 |
+| 2.1.2      | dockerfile/alpine_3.5 |
+| 2.1.3      | dockerfile/alpine_3.9 |
+| 2.2.0      | dockerfile/alpine_3.5 |
+| 2.2.1      | dockerfile/alpine_3.5 |
+| 2.2.2      | dockerfile/alpine_3.9 |
+| 2.2.3      | dockerfile/alpine_3.9 |
+| 2.3.0      | dockerfile/alpine_3.5 |
+| 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:
 

diff --git a/versions/alpine_3.5_2.1.1 → alpine_3.9_2.1.1 b/versions/alpine_3.5_2.1.1 → alpine_3.9_2.1.1
diff --git a/versions/alpine_3.5_2.1.2 → alpine_3.9_2.1.2 b/versions/alpine_3.5_2.1.2 → alpine_3.9_2.1.2
diff --git a/versions/alpine_3.5_2.2.0 → alpine_3.9_2.2.0 b/versions/alpine_3.5_2.2.0 → alpine_3.9_2.2.0
diff --git a/versions/alpine_3.5_2.2.1 → alpine_3.9_2.2.1 b/versions/alpine_3.5_2.2.1 → alpine_3.9_2.2.1
diff --git a/dockerfiles/alpine_3.5_2.x → dockerfiles/alpine_3.5 b/dockerfiles/alpine_3.5_2.x → dockerfiles/alpine_3.5
@@ -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 \
@@ -49,10 +47,11 @@ RUN set -x \
         lua \
         tar \
         zip \
-        zlib \
         libunwind \
         icu \
         ca-certificates \
+        curl \
+        git \
     && apk add --no-cache --virtual .build-deps \
         gcc \
         g++ \
@@ -61,7 +60,6 @@ RUN set -x \
         libressl-dev \
         yaml-dev \
         lz4-dev \
-        zlib-dev \
         binutils-dev \
         ncurses-dev \
         lua-dev \
@@ -74,18 +72,9 @@ RUN set -x \
         libtool \
         linux-headers \
         go \
-        tcl \
         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 \
@@ -171,7 +160,6 @@ RUN set -x \
         cyrus-sasl-dev \
         mosquitto-dev \
         libev-dev \
-        libressl-dev \
         unzip \
     && mkdir -p /rocks \
     && : "---------- proj (for gis module) ----------" \
@@ -199,7 +187,7 @@ RUN set -x \
     && : "---------- luarocks ----------" \
     && cd / \
     && : "ldoc" \
-    && ${ROCKS_INSTALLER} install ldoc \
+    && tarantoolctl rocks install ldoc \
     && : "lua-term" \
     && ${ROCKS_INSTALLER} install lua-term \
     && : "avro" \