Merge alpine_3.9* dockerfiles

Author: avtikhon

.gitlab-ci.yml

@@ -80,8 +80,8 @@ before_script:
     DIST: '3.9'
     TAG: '1.10.4'
     VER: '1.10.4'
-    DOCKERFILE_NAME_SUFFIX: '1.x'
     PORT: 5104
+    ROCKS_INSTALLER: 'luarocks'
 
 'alpine 3.9 1.10.5':
   <<: *build_definition
@@ -90,8 +90,8 @@ before_script:
     DIST: '3.9'
     TAG: '1.10.5'
     VER: '1.10.5'
-    DOCKERFILE_NAME_SUFFIX: '1.x'
     PORT: 5105
+    ROCKS_INSTALLER: 'luarocks'
 
 'alpine 3.9 1.10.6':
   <<: *build_definition
@@ -100,8 +100,8 @@ before_script:
     DIST: '3.9'
     TAG: '1.10.6'
     VER: '1.10.6'
-    DOCKERFILE_NAME_SUFFIX: '1.x'
     PORT: 5106
+    ROCKS_INSTALLER: 'luarocks'
 
 'alpine 3.9 1.x':
   <<: *build_definition
@@ -110,8 +110,8 @@ before_script:
     DIST: '3.9'
     TAG: '1'
     VER: '1.x'
-    DOCKERFILE_NAME_SUFFIX: '1.x'
     PORT: 5100
+    ROCKS_INSTALLER: 'luarocks'
 
 # Tarantool branch 2.1
 
@@ -152,8 +152,8 @@ before_script:
     DIST: '3.9'
     TAG: '2.1.3'
     VER: '2.1.3'
-    DOCKERFILE_NAME_SUFFIX: '1.x'
     PORT: 5213
+    ROCKS_INSTALLER: 'luarocks'
 
 'alpine 3.9 2.1':
   <<: *build_definition
@@ -162,8 +162,8 @@ before_script:
     DIST: '3.9'
     TAG: '2.1'
     VER: '2.1'
-    DOCKERFILE_NAME_SUFFIX: '2.2'
     PORT: 5210
+    ROCKS_INSTALLER: 'luarocks'
 
 # Tarantool branch 2.2
 
@@ -194,7 +194,6 @@ before_script:
     DIST: '3.9'
     TAG: '2.2.2'
     VER: '2.2.2'
-    DOCKERFILE_NAME_SUFFIX: '2.x'
     PORT: 5222
 
 'alpine 3.9 2.2.3':
@@ -204,7 +203,6 @@ before_script:
     DIST: '3.9'
     TAG: '2.2.3'
     VER: '2.2.3'
-    DOCKERFILE_NAME_SUFFIX: '2.x'
     PORT: 5223
 
 'alpine 3.9 2.2':
@@ -214,7 +212,6 @@ before_script:
     DIST: '3.9'
     TAG: '2.2'
     VER: '2.2'
-    DOCKERFILE_NAME_SUFFIX: '2.x'
     PORT: 5220
 
 # Tarantool branch 2.3
@@ -236,7 +233,6 @@ before_script:
     DIST: '3.9'
     TAG: '2.3.1'
     VER: '2.3.1'
-    DOCKERFILE_NAME_SUFFIX: '2.x'
     PORT: 5231
 
 'alpine 3.9 2.3.2':
@@ -246,7 +242,6 @@ before_script:
     DIST: '3.9'
     TAG: '2.3.2'
     VER: '2.3.2'
-    DOCKERFILE_NAME_SUFFIX: '2.x'
     PORT: 5231
 
 'alpine 3.9 2.3':
@@ -256,7 +251,6 @@ before_script:
     DIST: '3.9'
     TAG: '2.3'
     VER: '2.3'
-    DOCKERFILE_NAME_SUFFIX: '2.x'
     PORT: 5230
 
 # Tarantool branch 2.4
@@ -268,7 +262,6 @@ before_script:
     DIST: '3.9'
     TAG: '2.4.0'
     VER: '2.4.0'
-    DOCKERFILE_NAME_SUFFIX: '2.x'
     PORT: 5241
 
 'alpine 3.9 2.4.1':
@@ -278,7 +271,6 @@ before_script:
     DIST: '3.9'
     TAG: '2.4.1'
     VER: '2.4.1'
-    DOCKERFILE_NAME_SUFFIX: '2.x'
     PORT: 5241
 
 'alpine 3.9 2.4':
@@ -288,7 +280,6 @@ before_script:
     DIST: '3.9'
     TAG: '2.4'
     VER: '2.4'
-    DOCKERFILE_NAME_SUFFIX: '2.x'
     PORT: 5240
 
 # Tarantool branch master
@@ -300,7 +291,6 @@ before_script:
     DIST: '3.9'
     TAG: '2.5.0'
     VER: '2.5.0'
-    DOCKERFILE_NAME_SUFFIX: '2.x'
     PORT: 5251
 
 'alpine 3.9 2.x':
@@ -310,7 +300,6 @@ before_script:
     DIST: '3.9'
     TAG: '2'
     VER: '2.x'
-    DOCKERFILE_NAME_SUFFIX: '2.x'
     PORT: 5200
     TAG_LATEST: 'latest'
 

.gitlab.mk

@@ -1,9 +1,14 @@
 TNT_VER=$(shell cat versions/${OS}_${DIST}_${VER})
+ROCKS_INSTALLER?='tarantoolctl rocks'
 
 build:
-	docker build --no-cache --network=host --build-arg TNT_VER=${TNT_VER} \
+	[ "${DOCKERFILE_NAME_SUFFIX}" != "" ] && \
+		DOCKERFILE_SUFFIX=_${DOCKERFILE_NAME_SUFFIX} ; \
+	docker build --no-cache --network=host \
+		--build-arg ROCKS_INSTALLER=${ROCKS_INSTALLER} \
+		--build-arg TNT_VER=${TNT_VER} \
 		--build-arg BASE_IMAGE="${OS}:${DIST}" \
-		-t ${IMAGE}:${TAG} -f dockerfiles/${OS}_${DIST}_${DOCKERFILE_NAME_SUFFIX} .
+		-t ${IMAGE}:${TAG} -f dockerfiles/${OS}_${DIST}$${DOCKERFILE_SUFFIX} .
 	docker run --rm --name tarantool_${TAG} -p ${PORT}:${PORT} -d ${IMAGE}:${TAG}
 	docker exec -t tarantool_${TAG} tarantool_is_up
 	docker stop tarantool_${TAG}

dockerfiles/alpine_3.9_1.x renamed to dockerfiles/alpine_3.9

@@ -37,7 +37,7 @@ RUN set -x \
     && apk add --no-cache --virtual .run-deps \
         libstdc++ \
         readline \
-        libressl \
+        openssl \
         yaml \
         lz4 \
         binutils \
@@ -51,13 +51,12 @@ RUN set -x \
         icu \
         ca-certificates \
     && apk add --no-cache --virtual .build-deps \
-        perl \
         gcc \
         g++ \
         cmake \
         file \
         readline-dev \
-        libressl-dev \
+        openssl-dev \
         yaml-dev \
         lz4-dev \
         zlib-dev \
@@ -114,7 +113,7 @@ RUN set -x \
        git cherry-pick d7fa6d34ab4e0956fe8a80966ba628e0e3f81067 2>/dev/null || \
            git cherry-pick --abort ; \
        cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo\
-             -DENABLE_BUNDLED_LIBYAML:BOOL=OFF\
+             -DENABLE_BUNDLED_LIBYAML:BOOL=ON\
              -DENABLE_BACKTRACE:BOOL=ON\
              -DENABLE_DIST:BOOL=ON\
              .) \
@@ -159,6 +158,7 @@ RUN set -x \
         mosquitto-dev \
         libev-dev \
         wget \
+        unzip \
     && mkdir -p /rocks \
     && : "---------- proj (for gis module) ----------" \
     && wget -O proj.tar.gz http://download.osgeo.org/proj/proj-4.9.3.tar.gz \
@@ -183,8 +183,11 @@ RUN set -x \
     && rm -rf /usr/src/geos \
     && rm -rf /geos.tar.bz2 \
     && : "---------- luarocks ----------" \
+    && cd / \
+    && : "ldoc" \
+    && luarocks install ldoc --server=http://rocks.moonscript.org \
+    && : "lua-term" \
     && luarocks install lua-term \
-    && luarocks install ldoc \
     && : "avro" \
     && luarocks install avro-schema $LUAROCK_AVRO_SCHEMA_VERSION \
     && : "expirationd" \