Skip to content

Commit

Permalink
gitlab-ci: update tags/branches and bump versions
Browse files Browse the repository at this point in the history
Added new tags with manual builds:
1.10.10: 1.10.10-0-gaea7ae77a
2.6.3: 2.6.3-0-gcd487a2c5
2.7.2: 2.7.2-0-g4d8c06890
2.8.1: 2.8.1-0-ge2a1ec0c2
2.9.0: 2.9.0-0-g15bbdab92

Bumped/created branches:
2.6: 2.6.3-0-gcd487a2c5
2.7: 2.7.2-0-g4d8c06890
2.8: 2.8.1-0-ge2a1ec0c2

Updated stable images:
*1.x: 1.10.10-0-gaea7ae77a
*2.x: 2.7.2-0-g4d8c06890
  • Loading branch information
avtikhon committed Apr 22, 2021
1 parent 68f1f36 commit 8127002
Show file tree
Hide file tree
Showing 14 changed files with 81 additions and 11 deletions.
65 changes: 64 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -416,6 +427,7 @@ before_script:

'alpine 3.9 2.5':
<<: *build_definition
when: manual
variables:
OS: 'alpine'
DIST: '3.9'
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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:
Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions versions/alpine_3.9_1.10.10
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.10.10-0-gaea7ae77a
2 changes: 1 addition & 1 deletion versions/alpine_3.9_1.x
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.10.9-0-g720ffdd23
1.10.10-0-gaea7ae77a
2 changes: 1 addition & 1 deletion versions/alpine_3.9_2.6
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.2-0-g34d504d7d
2.6.3-0-gcd487a2c5
1 change: 1 addition & 0 deletions versions/alpine_3.9_2.6.3
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.6.3-0-gcd487a2c5
2 changes: 1 addition & 1 deletion versions/alpine_3.9_2.7
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.1-0-g3ac498c9f
2.7.2-0-g4d8c06890
1 change: 1 addition & 0 deletions versions/alpine_3.9_2.7.2
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.7.2-0-g4d8c06890
1 change: 1 addition & 0 deletions versions/alpine_3.9_2.8
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.8.1-0-ge2a1ec0c2
1 change: 1 addition & 0 deletions versions/alpine_3.9_2.8.1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.8.1-0-ge2a1ec0c2
1 change: 1 addition & 0 deletions versions/alpine_3.9_2.9.0
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.9.0-0-g15bbdab92
2 changes: 1 addition & 1 deletion versions/alpine_3.9_2.x
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.2-0-g34d504d7d
2.7.2-0-g4d8c06890
2 changes: 1 addition & 1 deletion versions/centos_7_1.x
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.10.9-0-g720ffdd23
1.10.10-0-gaea7ae77a
2 changes: 1 addition & 1 deletion versions/centos_7_2.x
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.2-0-g34d504d7d
2.7.2-0-g4d8c06890

0 comments on commit 8127002

Please sign in to comment.