From 96954ab538e5aef9df2c001d634ad9ab44f5aec3 Mon Sep 17 00:00:00 2001 From: "Alexander V. Tikhonov" Date: Mon, 13 Jul 2020 08:50:56 +0300 Subject: [PATCH] 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 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 --- .gitlab-ci.yml | 30 +- README.md | 64 ++--- versions/alpine_3.5_2.1.1 => alpine_3.9_2.1.1 | 0 versions/alpine_3.5_2.1.2 => alpine_3.9_2.1.2 | 0 versions/alpine_3.5_2.2.0 => alpine_3.9_2.2.0 | 0 versions/alpine_3.5_2.2.1 => alpine_3.9_2.2.1 | 0 dockerfiles/{alpine_3.5_1.x => alpine_3.5} | 17 +- dockerfiles/alpine_3.5_2.x | 256 ------------------ dockerfiles/alpine_3.9 | 3 + versions/alpine_3.9_2.1.1 | 1 + versions/alpine_3.9_2.1.2 | 1 + versions/alpine_3.9_2.2.0 | 1 + versions/alpine_3.9_2.2.1 | 1 + .../{alpine_3.5_2.3.0 => alpine_3.9_2.3.0} | 0 14 files changed, 52 insertions(+), 322 deletions(-) rename versions/alpine_3.5_2.1.1 => alpine_3.9_2.1.1 (100%) rename versions/alpine_3.5_2.1.2 => alpine_3.9_2.1.2 (100%) rename versions/alpine_3.5_2.2.0 => alpine_3.9_2.2.0 (100%) rename versions/alpine_3.5_2.2.1 => alpine_3.9_2.2.1 (100%) rename dockerfiles/{alpine_3.5_1.x => alpine_3.5} (94%) delete mode 100644 dockerfiles/alpine_3.5_2.x create mode 100644 versions/alpine_3.9_2.1.1 create mode 100644 versions/alpine_3.9_2.1.2 create mode 100644 versions/alpine_3.9_2.2.0 create mode 100644 versions/alpine_3.9_2.2.1 rename versions/{alpine_3.5_2.3.0 => alpine_3.9_2.3.0} (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a4d374..fdca9d0 100644 --- 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 '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': diff --git a/README.md b/README.md index 2657360..11ababd 100644 --- a/README.md +++ b/README.md @@ -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: diff --git a/versions/alpine_3.5_2.1.1 b/alpine_3.9_2.1.1 similarity index 100% rename from versions/alpine_3.5_2.1.1 rename to alpine_3.9_2.1.1 diff --git a/versions/alpine_3.5_2.1.2 b/alpine_3.9_2.1.2 similarity index 100% rename from versions/alpine_3.5_2.1.2 rename to alpine_3.9_2.1.2 diff --git a/versions/alpine_3.5_2.2.0 b/alpine_3.9_2.2.0 similarity index 100% rename from versions/alpine_3.5_2.2.0 rename to alpine_3.9_2.2.0 diff --git a/versions/alpine_3.5_2.2.1 b/alpine_3.9_2.2.1 similarity index 100% rename from versions/alpine_3.5_2.2.1 rename to alpine_3.9_2.2.1 diff --git a/dockerfiles/alpine_3.5_1.x b/dockerfiles/alpine_3.5 similarity index 94% rename from dockerfiles/alpine_3.5_1.x rename to dockerfiles/alpine_3.5 index 234efac..71f55f1 100644 --- a/dockerfiles/alpine_3.5_1.x +++ b/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 \ @@ -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" \ diff --git a/dockerfiles/alpine_3.5_2.x b/dockerfiles/alpine_3.5_2.x deleted file mode 100644 index fddbae0..0000000 --- a/dockerfiles/alpine_3.5_2.x +++ /dev/null @@ -1,256 +0,0 @@ -ARG BASE_IMAGE -FROM ${BASE_IMAGE} -MAINTAINER mail@racktear.com - -RUN addgroup -S tarantool \ - && adduser -S -G tarantool tarantool \ - && apk add --no-cache 'su-exec>=0.2' - -# An ARG instruction goes out of scope at the end of the build -# stage where it was defined. To use an arg in multiple stages, -# each stage must include the ARG instruction -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 \ - LUAROCK_VSHARD_VERSION=0.1.14 \ - LUAROCK_AVRO_SCHEMA_VERSION=3.0.3 \ - LUAROCK_EXPERATIOND_VERSION=1.0.1 \ - LUAROCK_QUEUE_VERSION=1.0.6 \ - LUAROCK_CONNPOOL_VERSION=1.1.1 \ - LUAROCK_HTTP_VERSION=1.1.0 \ - LUAROCK_MEMCACHED_VERSION=1.0.1 \ - LUAROCK_METRICS_VERSION=0.2.0 \ - LUAROCK_TARANTOOL_PG_VERSION=2.0.2 \ - LUAROCK_TARANTOOL_MYSQL_VERSION=2.0.1 \ - LUAROCK_TARANTOOL_MQTT_VERSION=1.2.1 \ - LUAROCK_TARANTOOL_GIS_VERSION=1.0.0 \ - LUAROCK_TARANTOOL_PROMETHEUS_VERSION=1.0.4 \ - LUAROCK_TARANTOOL_GPERFTOOLS_VERSION=1.0.1 - -COPY files/gperftools_alpine.diff / - -RUN set -x \ - && apk add --no-cache --virtual .run-deps \ - libstdc++ \ - readline \ - libressl \ - yaml \ - lz4 \ - binutils \ - ncurses \ - libgomp \ - lua \ - tar \ - zip \ - zlib \ - libunwind \ - icu \ - ca-certificates \ - && apk add --no-cache --virtual .build-deps \ - perl \ - gcc \ - g++ \ - cmake \ - readline-dev \ - libressl-dev \ - yaml-dev \ - lz4-dev \ - zlib-dev \ - binutils-dev \ - ncurses-dev \ - lua-dev \ - musl-dev \ - make \ - git \ - libunwind-dev \ - autoconf \ - automake \ - 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) \ - && : "---------- gperftools ----------" \ - && mkdir -p /usr/src/gperftools \ - && git clone "$GPERFTOOLS_REPO" /usr/src/gperftools \ - && git -C /usr/src/gperftools checkout "$GPERFTOOLS_TAG" \ - && (cd /usr/src/gperftools; \ - patch -p1 < /gperftools_alpine.diff; \ - rm /gperftools_alpine.diff; \ - ./autogen.sh; \ - ./configure; \ - make -j ; \ - cp .libs/libprofiler.so* /usr/local/lib;) \ - && : "---------- pprof for gperftools ----------" \ - && : "To avoid of the issue:" \ - && : "'The master branch is Incompatible with go version < 1.13 #538'" \ - && : "https://github.com/google/pprof/issues/538" \ - && : "use latest workable commits with the old GO versions" \ - && ( export GOPATH=/root/go && \ - export PATH=${GOPATH}/bin:/usr/local/go/bin:$PATH && \ - export GOBIN=$GOROOT/bin && \ - mkdir -p ${GOPATH}/src ${GOPATH}/bin && \ - go get github.com/google/pprof || : && \ - cd /root/go/src/github.com/google/pprof && \ - git checkout 160c4290d1d8cee56daa51d7ba5d223291d392aa && \ - ( cd /root/go/src/github.com/chzyer/readline && \ - git checkout f6d7a1f6fbf35bbf9beb80dc63c56a29dcfb759f ) && \ - ( cd /root/go/src/github.com/ianlancetaylor/demangle && \ - git checkout 039b1ae3a3406573c84daaf91166d70ad2bc0519 ) && \ - go build && \ - cp pprof /usr/local/bin/pprof ) \ - && : "---------- tarantool ----------" \ - && mkdir -p /usr/src/tarantool \ - && git clone "$TARANTOOL_DOWNLOAD_URL" /usr/src/tarantool \ - && git -C /usr/src/tarantool checkout "$TARANTOOL_VERSION" \ - && git -C /usr/src/tarantool submodule update --init --recursive \ - && (cd /usr/src/tarantool; \ - cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo\ - -DENABLE_BUNDLED_LIBYAML:BOOL=OFF\ - -DENABLE_BACKTRACE:BOOL=ON\ - -DENABLE_DIST:BOOL=ON\ - .) \ - && make -C /usr/src/tarantool -j\ - && make -C /usr/src/tarantool install \ - && make -C /usr/src/tarantool clean \ - && : "---------- luarocks ----------" \ - && wget -O luarocks.tar.gz "$LUAROCKS_URL" \ - && mkdir -p /usr/src/luarocks \ - && tar -xzf luarocks.tar.gz -C /usr/src/luarocks --strip-components=1 \ - && (cd /usr/src/luarocks; \ - ./configure; \ - make -j build; \ - make install) \ - && rm -r /usr/src/luarocks \ - && rm -rf /usr/src/tarantool \ - && rm -rf /usr/src/gperftools \ - && rm -rf /usr/src/go \ - && : "---------- remove build deps ----------" \ - && apk del .build-deps - -COPY files/luarocks-config.lua /usr/local/etc/luarocks/config-5.1.lua - -RUN set -x \ - && apk add --no-cache --virtual .run-deps \ - mariadb-client-libs \ - libpq \ - cyrus-sasl \ - mosquitto-libs \ - libev \ - && apk add --no-cache --virtual .build-deps \ - git \ - cmake \ - make \ - coreutils \ - gcc \ - g++ \ - postgresql-dev \ - lua-dev \ - musl-dev \ - cyrus-sasl-dev \ - mosquitto-dev \ - libev-dev \ - libressl-dev \ - unzip \ - && mkdir -p /rocks \ - && : "---------- proj (for gis module) ----------" \ - && wget -O proj.tar.gz http://download.osgeo.org/proj/proj-4.9.3.tar.gz \ - && mkdir -p /usr/src/proj \ - && tar -xzf proj.tar.gz -C /usr/src/proj --strip-components=1 \ - && (cd /usr/src/proj; \ - ./configure; \ - make -j ; \ - make install) \ - && rm -r /usr/src/proj \ - && rm -rf /usr/src/proj \ - && rm -rf /proj.tar.gz \ - && : "---------- geos (for gis module) ----------" \ - && wget -O geos.tar.bz2 http://download.osgeo.org/geos/geos-3.6.0.tar.bz2 \ - && mkdir -p /usr/src/geos \ - && tar -xjf geos.tar.bz2 -C /usr/src/geos --strip-components=1 \ - && (cd /usr/src/geos; \ - ./configure; \ - make -j ; \ - make install) \ - && rm -r /usr/src/geos \ - && rm -rf /usr/src/geos \ - && rm -rf /geos.tar.bz2 \ - && : "---------- luarocks ----------" \ - && cd / \ - && : "ldoc" \ - && tarantoolctl rocks install ldoc --server=http://rocks.moonscript.org \ - && : "lua-term" \ - && tarantoolctl rocks install lua-term \ - && : "avro" \ - && tarantoolctl rocks install avro-schema $LUAROCK_AVRO_SCHEMA_VERSION \ - && : "expirationd" \ - && tarantoolctl rocks install expirationd $LUAROCK_EXPERATIOND_VERSION \ - && : "queue" \ - && tarantoolctl rocks install queue $LUAROCK_QUEUE_VERSION \ - && : "connpool" \ - && tarantoolctl rocks install connpool $LUAROCK_CONNPOOL_VERSION \ - && : "vshard" \ - && tarantoolctl rocks install vshard $LUAROCK_VSHARD_VERSION \ - && : "http" \ - && tarantoolctl rocks install http $LUAROCK_HTTP_VERSION \ - && : "pg" \ - && tarantoolctl rocks install pg $LUAROCK_TARANTOOL_PG_VERSION \ - && : "mysql" \ - && tarantoolctl rocks install mysql $LUAROCK_TARANTOOL_MYSQL_VERSION \ - && : "memcached" \ - && tarantoolctl rocks install memcached $LUAROCK_MEMCACHED_VERSION \ - && : "metrics" \ - && tarantoolctl rocks install metrics $LUAROCK_METRICS_VERSION \ - && : "prometheus" \ - && tarantoolctl rocks install prometheus $LUAROCK_TARANTOOL_PROMETHEUS_VERSION \ - && : "mqtt" \ - && tarantoolctl rocks install mqtt $LUAROCK_TARANTOOL_MQTT_VERSION \ - && : "gis" \ - && tarantoolctl rocks install gis $LUAROCK_TARANTOOL_GIS_VERSION \ - && : "gperftools" \ - && tarantoolctl rocks install gperftools $LUAROCK_TARANTOOL_GPERFTOOLS_VERSION \ - && : "---------- remove build deps ----------" \ - && apk del .build-deps - -RUN mkdir -p /var/lib/tarantool \ - && chown tarantool:tarantool /var/lib/tarantool \ - && mkdir -p /opt/tarantool \ - && chown tarantool:tarantool /opt/tarantool \ - && mkdir -p /var/run/tarantool \ - && chown tarantool:tarantool /var/run/tarantool \ - && mkdir /etc/tarantool \ - && chown tarantool:tarantool /etc/tarantool - -VOLUME /var/lib/tarantool -WORKDIR /opt/tarantool - -COPY files/tarantool-entrypoint.lua /usr/local/bin/ -COPY files/tarantool_set_config.lua /usr/local/bin/ -COPY files/docker-entrypoint.sh /usr/local/bin/ -COPY files/console /usr/local/bin/ -COPY files/tarantool_is_up /usr/local/bin/ -COPY files/tarantool.default /usr/local/etc/default/tarantool - -RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat -ENTRYPOINT ["docker-entrypoint.sh"] - -HEALTHCHECK CMD tarantool_is_up - -EXPOSE 3301 -CMD [ "tarantool" ] diff --git a/dockerfiles/alpine_3.9 b/dockerfiles/alpine_3.9 index 4ef0583..7c472c4 100644 --- a/dockerfiles/alpine_3.9 +++ b/dockerfiles/alpine_3.9 @@ -50,6 +50,8 @@ RUN set -x \ libunwind \ icu \ ca-certificates \ + curl \ + git \ && apk add --no-cache --virtual .build-deps \ gcc \ g++ \ @@ -74,6 +76,7 @@ RUN set -x \ go \ icu-dev \ wget \ + curl-dev \ && : "---------- gperftools ----------" \ && mkdir -p /usr/src/gperftools \ && git clone "$GPERFTOOLS_REPO" /usr/src/gperftools \ diff --git a/versions/alpine_3.9_2.1.1 b/versions/alpine_3.9_2.1.1 new file mode 100644 index 0000000..0c1c7e7 --- /dev/null +++ b/versions/alpine_3.9_2.1.1 @@ -0,0 +1 @@ +2.1.1-0-g8a09adb46 diff --git a/versions/alpine_3.9_2.1.2 b/versions/alpine_3.9_2.1.2 new file mode 100644 index 0000000..707313e --- /dev/null +++ b/versions/alpine_3.9_2.1.2 @@ -0,0 +1 @@ +2.1.2-2-gd06f95fc1 diff --git a/versions/alpine_3.9_2.2.0 b/versions/alpine_3.9_2.2.0 new file mode 100644 index 0000000..c8920cc --- /dev/null +++ b/versions/alpine_3.9_2.2.0 @@ -0,0 +1 @@ +2.2.0-0-gb58001013 diff --git a/versions/alpine_3.9_2.2.1 b/versions/alpine_3.9_2.2.1 new file mode 100644 index 0000000..10db341 --- /dev/null +++ b/versions/alpine_3.9_2.2.1 @@ -0,0 +1 @@ +2.2.1-3-g878e2a42c diff --git a/versions/alpine_3.5_2.3.0 b/versions/alpine_3.9_2.3.0 similarity index 100% rename from versions/alpine_3.5_2.3.0 rename to versions/alpine_3.9_2.3.0