[Tarantool-patches] [PATCH docker v1 0/4] Implement gitlab-ci testing and reorganize repository files structure

Alexander V. Tikhonov avtikhon at tarantool.org
Mon Jan 13 14:48:34 MSK 2020


Made changes:
 - Added into Gitlab-CI testing
 - Change keyserver using port 80 to be easy accessed
 - Reorganized files in repository in the following way:
    
    .gitlab-ci.yml
    .gitlab.mk
    ├── dockerfiles
    │   ├── <OS>_<Tarantool version tag>
    │   ├── alpine_3.5_1.x
    │   ├── alpine_3.5_2.1.3
    │   ├── alpine_3.5_2.2
    │   ├── ...
    │   ├── alpine_3.5_2.x
    │   ├── centos_7_1.x
    │   └── centos_7_2.x
    ├── files
    │   ├── <common files for different builds>
    │   └── ...
    ├── README.md
    └── versions
        ├── <files with Tarantool versions for Dockerfiles>
        ├── alpine_3.5_1.x
        ├── alpine_3.5_2.1
        ├── alpine_3.5_2.1.3
        ├── alpine_3.5_2.2
        ├── ...
        ├── alpine_3.5_2.x
        ├── centos_7_1.x
        └── centos_7_2.x
    
To rerun the build use the following environment example:    
    IMAGE=tarantool/tarantool TAG=2.1 OS=alpine_3.5 VER=2.1 DVER=2.2 \
        PORT=3121 make -f .gitlab.mk build

Alexander V. Tikhonov (5):
  Add into Gitlab-CI testing
  Merge files in repository
  Move tagged versions into master
  Change keyserver to be easy accessed
  Fix 2.2 build

 .gitlab-ci.yml                                | 218 +++++++++++--
 .gitlab.mk                                    |  13 +
 1.5/Dockerfile                                | 105 -------
 1.5/docker-entrypoint.sh                      |  69 -----
 1.6/Dockerfile                                | 280 -----------------
 1.6/luarocks-config.lua                       |   9 -
 1.6/tarantool-entrypoint.lua                  | 261 ----------------
 1.6/tarantool.default                         |  21 --
 1.6/tarantool_set_config.lua                  | 129 --------
 1.7/Dockerfile                                | 244 ---------------
 1.7/console                                   |  15 -
 1.7/docker-entrypoint.sh                      |  22 --
 1.7/gperftools_alpine.diff                    | 110 -------
 1.7/luarocks-config.lua                       |   9 -
 1.7/tarantool-entrypoint.lua                  | 292 ------------------
 1.7/tarantool_is_up                           |  41 ---
 1.7/tarantool_set_config.lua                  | 130 --------
 1.9/console                                   |  15 -
 1.9/docker-entrypoint.sh                      |  22 --
 1.9/gperftools_alpine.diff                    | 110 -------
 1.9/luarocks-config.lua                       |   9 -
 1.9/tarantool-entrypoint.lua                  | 292 ------------------
 1.9/tarantool.default                         |  22 --
 1.9/tarantool_is_up                           |  41 ---
 1.9/tarantool_set_config.lua                  | 130 --------
 1.x-centos7/.dockerignore                     |   0
 1.x-centos7/console                           |  15 -
 1.x-centos7/tarantool-entrypoint.lua          | 292 ------------------
 1.x-centos7/tarantool.default                 |  22 --
 1.x-centos7/tarantool_is_up                   |  41 ---
 1.x-centos7/tarantool_set_config.lua          | 130 --------
 1.x/console                                   |  15 -
 1.x/docker-entrypoint.sh                      |  22 --
 1.x/gperftools_alpine.diff                    | 110 -------
 1.x/luarocks-config.lua                       |   9 -
 1.x/tarantool-entrypoint.lua                  | 292 ------------------
 1.x/tarantool.default                         |  22 --
 1.x/tarantool_is_up                           |  41 ---
 1.x/tarantool_set_config.lua                  | 130 --------
 2.1/console                                   |  15 -
 2.1/docker-entrypoint.sh                      |  22 --
 2.1/gperftools_alpine.diff                    | 110 -------
 2.1/luarocks-config.lua                       |   9 -
 2.1/tarantool-entrypoint.lua                  | 292 ------------------
 2.1/tarantool.default                         |  22 --
 2.1/tarantool_is_up                           |  41 ---
 2.1/tarantool_set_config.lua                  | 130 --------
 2.2/console                                   |  15 -
 2.2/docker-entrypoint.sh                      |  22 --
 2.2/gperftools_alpine.diff                    | 110 -------
 2.2/luarocks-config.lua                       |   9 -
 2.2/tarantool-entrypoint.lua                  | 292 ------------------
 2.2/tarantool.default                         |  22 --
 2.2/tarantool_is_up                           |  41 ---
 2.2/tarantool_set_config.lua                  | 130 --------
 2.x-centos7/.dockerignore                     |   0
 2.x-centos7/console                           |  15 -
 2.x-centos7/docker-entrypoint.sh              |  22 --
 2.x-centos7/mosquitto.repo                    |   7 -
 2.x-centos7/tarantool.default                 |  22 --
 2.x-centos7/tarantool_is_up                   |  41 ---
 2.x/console                                   |  15 -
 2.x/docker-entrypoint.sh                      |  22 --
 2.x/gperftools_alpine.diff                    | 110 -------
 2.x/tarantool-entrypoint.lua                  | 291 -----------------
 2.x/tarantool.default                         |  22 --
 2.x/tarantool_is_up                           |  41 ---
 2.x/tarantool_set_config.lua                  | 130 --------
 README.md                                     |  55 ++--
 .../alpine_3.5_1.10.3                         |  25 +-
 1.x/Dockerfile => dockerfiles/alpine_3.5_1.x  |  22 +-
 2.2/Dockerfile => dockerfiles/alpine_3.5_2.2  |  24 +-
 .../alpine_3.5_2.2.1                          |  25 +-
 2.x/Dockerfile => dockerfiles/alpine_3.5_2.x  |  20 +-
 .../Dockerfile => dockerfiles/centos_7_1.x    |  20 +-
 .../Dockerfile => dockerfiles/centos_7_2.x    |  22 +-
 {1.6 => files}/console                        |   0
 {1.6 => files}/docker-entrypoint.sh           |   0
 .../docker-entrypoint_centos.sh               |   0
 {1.6 => files}/gperftools_alpine.diff         |   0
 {1.5 => files}/luarocks-config.lua            |   0
 .../luarocks-config_centos.lua                |   0
 {1.x-centos7 => files}/mosquitto.repo         |   0
 .../tarantool-entrypoint.lua                  |   0
 {1.7 => files}/tarantool.default              |   0
 {1.6 => files}/tarantool_is_up                |   0
 .../tarantool_set_config.lua                  |   0
 versions/alpine_3.5_1.10.0                    |   1 +
 versions/alpine_3.5_1.10.2                    |   1 +
 versions/alpine_3.5_1.10.3                    |   1 +
 versions/alpine_3.5_1.10.4                    |   1 +
 versions/alpine_3.5_1.x                       |   1 +
 versions/alpine_3.5_2.1                       |   1 +
 versions/alpine_3.5_2.1.1                     |   1 +
 versions/alpine_3.5_2.1.2                     |   1 +
 versions/alpine_3.5_2.1.3                     |   1 +
 versions/alpine_3.5_2.2                       |   1 +
 versions/alpine_3.5_2.2.0                     |   1 +
 versions/alpine_3.5_2.2.1                     |   1 +
 versions/alpine_3.5_2.2.2                     |   1 +
 versions/alpine_3.5_2.3                       |   1 +
 versions/alpine_3.5_2.3.1                     |   1 +
 versions/alpine_3.5_2.x                       |   1 +
 versions/centos_7_1.x                         |   1 +
 versions/centos_7_2.x                         |   1 +
 105 files changed, 344 insertions(+), 5657 deletions(-)
 create mode 100644 .gitlab.mk
 delete mode 100644 1.5/Dockerfile
 delete mode 100755 1.5/docker-entrypoint.sh
 delete mode 100644 1.6/Dockerfile
 delete mode 100644 1.6/luarocks-config.lua
 delete mode 100755 1.6/tarantool-entrypoint.lua
 delete mode 100644 1.6/tarantool.default
 delete mode 100755 1.6/tarantool_set_config.lua
 delete mode 100644 1.7/Dockerfile
 delete mode 100755 1.7/console
 delete mode 100755 1.7/docker-entrypoint.sh
 delete mode 100644 1.7/gperftools_alpine.diff
 delete mode 100644 1.7/luarocks-config.lua
 delete mode 100755 1.7/tarantool-entrypoint.lua
 delete mode 100755 1.7/tarantool_is_up
 delete mode 100755 1.7/tarantool_set_config.lua
 delete mode 100755 1.9/console
 delete mode 100755 1.9/docker-entrypoint.sh
 delete mode 100644 1.9/gperftools_alpine.diff
 delete mode 100644 1.9/luarocks-config.lua
 delete mode 100755 1.9/tarantool-entrypoint.lua
 delete mode 100644 1.9/tarantool.default
 delete mode 100755 1.9/tarantool_is_up
 delete mode 100755 1.9/tarantool_set_config.lua
 delete mode 100644 1.x-centos7/.dockerignore
 delete mode 100755 1.x-centos7/console
 delete mode 100755 1.x-centos7/tarantool-entrypoint.lua
 delete mode 100644 1.x-centos7/tarantool.default
 delete mode 100755 1.x-centos7/tarantool_is_up
 delete mode 100755 1.x-centos7/tarantool_set_config.lua
 delete mode 100755 1.x/console
 delete mode 100755 1.x/docker-entrypoint.sh
 delete mode 100644 1.x/gperftools_alpine.diff
 delete mode 100644 1.x/luarocks-config.lua
 delete mode 100755 1.x/tarantool-entrypoint.lua
 delete mode 100644 1.x/tarantool.default
 delete mode 100755 1.x/tarantool_is_up
 delete mode 100755 1.x/tarantool_set_config.lua
 delete mode 100755 2.1/console
 delete mode 100755 2.1/docker-entrypoint.sh
 delete mode 100644 2.1/gperftools_alpine.diff
 delete mode 100644 2.1/luarocks-config.lua
 delete mode 100755 2.1/tarantool-entrypoint.lua
 delete mode 100644 2.1/tarantool.default
 delete mode 100755 2.1/tarantool_is_up
 delete mode 100755 2.1/tarantool_set_config.lua
 delete mode 100755 2.2/console
 delete mode 100755 2.2/docker-entrypoint.sh
 delete mode 100644 2.2/gperftools_alpine.diff
 delete mode 100644 2.2/luarocks-config.lua
 delete mode 100755 2.2/tarantool-entrypoint.lua
 delete mode 100644 2.2/tarantool.default
 delete mode 100755 2.2/tarantool_is_up
 delete mode 100755 2.2/tarantool_set_config.lua
 delete mode 100644 2.x-centos7/.dockerignore
 delete mode 100755 2.x-centos7/console
 delete mode 100755 2.x-centos7/docker-entrypoint.sh
 delete mode 100644 2.x-centos7/mosquitto.repo
 delete mode 100644 2.x-centos7/tarantool.default
 delete mode 100755 2.x-centos7/tarantool_is_up
 delete mode 100755 2.x/console
 delete mode 100755 2.x/docker-entrypoint.sh
 delete mode 100644 2.x/gperftools_alpine.diff
 delete mode 100755 2.x/tarantool-entrypoint.lua
 delete mode 100644 2.x/tarantool.default
 delete mode 100755 2.x/tarantool_is_up
 delete mode 100755 2.x/tarantool_set_config.lua
 rename 1.9/Dockerfile => dockerfiles/alpine_3.5_1.10.3 (91%)
 rename 1.x/Dockerfile => dockerfiles/alpine_3.5_1.x (92%)
 rename 2.2/Dockerfile => dockerfiles/alpine_3.5_2.2 (92%)
 rename 2.1/Dockerfile => dockerfiles/alpine_3.5_2.2.1 (91%)
 rename 2.x/Dockerfile => dockerfiles/alpine_3.5_2.x (92%)
 rename 1.x-centos7/Dockerfile => dockerfiles/centos_7_1.x (94%)
 rename 2.x-centos7/Dockerfile => dockerfiles/centos_7_2.x (93%)
 rename {1.6 => files}/console (100%)
 rename {1.6 => files}/docker-entrypoint.sh (100%)
 rename 1.x-centos7/docker-entrypoint.sh => files/docker-entrypoint_centos.sh (100%)
 rename {1.6 => files}/gperftools_alpine.diff (100%)
 rename {1.5 => files}/luarocks-config.lua (100%)
 rename 1.x-centos7/luarocks-config.lua => files/luarocks-config_centos.lua (100%)
 rename {1.x-centos7 => files}/mosquitto.repo (100%)
 rename {2.x-centos7 => files}/tarantool-entrypoint.lua (100%)
 rename {1.7 => files}/tarantool.default (100%)
 rename {1.6 => files}/tarantool_is_up (100%)
 rename {2.x-centos7 => files}/tarantool_set_config.lua (100%)
 create mode 100644 versions/alpine_3.5_1.10.0
 create mode 100644 versions/alpine_3.5_1.10.2
 create mode 100644 versions/alpine_3.5_1.10.3
 create mode 100644 versions/alpine_3.5_1.10.4
 create mode 100644 versions/alpine_3.5_1.x
 create mode 100644 versions/alpine_3.5_2.1
 create mode 100644 versions/alpine_3.5_2.1.1
 create mode 100644 versions/alpine_3.5_2.1.2
 create mode 100644 versions/alpine_3.5_2.1.3
 create mode 100644 versions/alpine_3.5_2.2
 create mode 100644 versions/alpine_3.5_2.2.0
 create mode 100644 versions/alpine_3.5_2.2.1
 create mode 100644 versions/alpine_3.5_2.2.2
 create mode 100644 versions/alpine_3.5_2.3
 create mode 100644 versions/alpine_3.5_2.3.1
 create mode 100644 versions/alpine_3.5_2.x
 create mode 100644 versions/centos_7_1.x
 create mode 100644 versions/centos_7_2.x

-- 
2.17.1



More information about the Tarantool-patches mailing list