diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3c251d3..aef21ab 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -146,6 +146,17 @@ before_script: PORT: 5109 ROCKS_INSTALLER: 'luarocks' +'alpine 3.9 1.10.10': + <<: *build_definition + when: manual + variables: + OS: 'alpine' + DIST: '3.9' + TAG: '1.10.10' + VER: '1.10.10' + PORT: 5110 + ROCKS_INSTALLER: 'luarocks' + 'alpine 3.9 1.x': <<: *build_definition variables: @@ -416,6 +427,7 @@ before_script: 'alpine 3.9 2.5': <<: *build_definition + when: manual variables: OS: 'alpine' DIST: '3.9' @@ -455,6 +467,16 @@ before_script: VER: '2.6.2' PORT: 5262 +'alpine 3.9 2.6.3': + <<: *build_definition + when: manual + variables: + OS: 'alpine' + DIST: '3.9' + TAG: '2.6.3' + VER: '2.6.3' + PORT: 5263 + 'alpine 3.9 2.6': <<: *build_definition variables: @@ -486,6 +508,16 @@ before_script: VER: '2.7.1' PORT: 5271 +'alpine 3.9 2.7.2': + <<: *build_definition + when: manual + variables: + OS: 'alpine' + DIST: '3.9' + TAG: '2.7.2' + VER: '2.7.2' + PORT: 5272 + 'alpine 3.9 2.7': <<: *build_definition variables: @@ -495,7 +527,7 @@ before_script: VER: '2.7' PORT: 5279 -# Tarantool branch master +# Tarantool branch 2.8 'alpine 3.9 2.8.0': <<: *build_definition @@ -507,6 +539,37 @@ before_script: VER: '2.8.0' PORT: 5270 +'alpine 3.9 2.8.1': + <<: *build_definition + when: manual + variables: + OS: 'alpine' + DIST: '3.9' + TAG: '2.8.1' + VER: '2.8.1' + PORT: 5281 + +'alpine 3.9 2.8': + <<: *build_definition + variables: + OS: 'alpine' + DIST: '3.9' + TAG: '2.8' + VER: '2.8' + PORT: 5289 + +# Tarantool branch master + +'alpine 3.9 2.9.0': + <<: *build_definition + when: manual + variables: + OS: 'alpine' + DIST: '3.9' + TAG: '2.9.0' + VER: '2.9.0' + PORT: 5290 + 'alpine 3.9 2.x': <<: *build_definition variables: diff --git a/README.md b/README.md index 68c6d28..e854b9a 100644 --- a/README.md +++ b/README.md @@ -331,16 +331,17 @@ Fixed versions: | 2.3.1 .. 2.3.3 | dockerfile/alpine_3.9 | | 2.4.0 .. 2.4.3 | dockerfile/alpine_3.9 | | 2.5.0 .. 2.5.3 | dockerfile/alpine_3.9 | -| 2.6.0 .. 2.6.2 | dockerfile/alpine_3.9 | -| 2.7.0 .. 2.7.1 | dockerfile/alpine_3.9 | -| 2.8.0 | dockerfile/alpine_3.9 | +| 2.6.0 .. 2.6.3 | dockerfile/alpine_3.9 | +| 2.7.0 .. 2.7.2 | dockerfile/alpine_3.9 | +| 2.8.0 .. 2.8.1 | dockerfile/alpine_3.9 | +| 2.9.0 | dockerfile/alpine_3.9 | Rolling versions: | Docker tag | Dockerfile | | ---------- | --------------------- | | 1 | dockerfile/alpine_3.9 | -| 2.1 .. 2.7 | dockerfile/alpine_3.9 | +| 2.1 .. 2.8 | dockerfile/alpine_3.9 | | 2, latest | dockerfile/alpine_3.9 | Special builds: diff --git a/versions/alpine_3.9_1.10.10 b/versions/alpine_3.9_1.10.10 new file mode 100644 index 0000000..21750c0 --- /dev/null +++ b/versions/alpine_3.9_1.10.10 @@ -0,0 +1 @@ +1.10.10-0-gaea7ae77a diff --git a/versions/alpine_3.9_1.x b/versions/alpine_3.9_1.x index beeb43b..21750c0 100644 --- a/versions/alpine_3.9_1.x +++ b/versions/alpine_3.9_1.x @@ -1 +1 @@ -1.10.9-0-g720ffdd23 +1.10.10-0-gaea7ae77a diff --git a/versions/alpine_3.9_2.6 b/versions/alpine_3.9_2.6 index a5b2bcb..6e81225 100644 --- a/versions/alpine_3.9_2.6 +++ b/versions/alpine_3.9_2.6 @@ -1 +1 @@ -2.6.2-0-g34d504d7d +2.6.3-0-gcd487a2c5 diff --git a/versions/alpine_3.9_2.6.3 b/versions/alpine_3.9_2.6.3 new file mode 100644 index 0000000..6e81225 --- /dev/null +++ b/versions/alpine_3.9_2.6.3 @@ -0,0 +1 @@ +2.6.3-0-gcd487a2c5 diff --git a/versions/alpine_3.9_2.7 b/versions/alpine_3.9_2.7 index f8b07c8..63b9bd4 100644 --- a/versions/alpine_3.9_2.7 +++ b/versions/alpine_3.9_2.7 @@ -1 +1 @@ -2.7.1-0-g3ac498c9f +2.7.2-0-g4d8c06890 diff --git a/versions/alpine_3.9_2.7.2 b/versions/alpine_3.9_2.7.2 new file mode 100644 index 0000000..63b9bd4 --- /dev/null +++ b/versions/alpine_3.9_2.7.2 @@ -0,0 +1 @@ +2.7.2-0-g4d8c06890 diff --git a/versions/alpine_3.9_2.8 b/versions/alpine_3.9_2.8 new file mode 100644 index 0000000..8d4caa2 --- /dev/null +++ b/versions/alpine_3.9_2.8 @@ -0,0 +1 @@ +2.8.1-0-ge2a1ec0c2 diff --git a/versions/alpine_3.9_2.8.1 b/versions/alpine_3.9_2.8.1 new file mode 100644 index 0000000..8d4caa2 --- /dev/null +++ b/versions/alpine_3.9_2.8.1 @@ -0,0 +1 @@ +2.8.1-0-ge2a1ec0c2 diff --git a/versions/alpine_3.9_2.9.0 b/versions/alpine_3.9_2.9.0 new file mode 100644 index 0000000..302c949 --- /dev/null +++ b/versions/alpine_3.9_2.9.0 @@ -0,0 +1 @@ +2.9.0-0-g15bbdab92 diff --git a/versions/alpine_3.9_2.x b/versions/alpine_3.9_2.x index a5b2bcb..63b9bd4 100644 --- a/versions/alpine_3.9_2.x +++ b/versions/alpine_3.9_2.x @@ -1 +1 @@ -2.6.2-0-g34d504d7d +2.7.2-0-g4d8c06890 diff --git a/versions/centos_7_1.x b/versions/centos_7_1.x index beeb43b..21750c0 100644 --- a/versions/centos_7_1.x +++ b/versions/centos_7_1.x @@ -1 +1 @@ -1.10.9-0-g720ffdd23 +1.10.10-0-gaea7ae77a diff --git a/versions/centos_7_2.x b/versions/centos_7_2.x index a5b2bcb..63b9bd4 100644 --- a/versions/centos_7_2.x +++ b/versions/centos_7_2.x @@ -1 +1 @@ -2.6.2-0-g34d504d7d +2.7.2-0-g4d8c06890