Skip to content

Commit 14bab38

Browse files
authored
Merge pull request #13 from Diman0/master
Make 1.8 the new stable version.
2 parents bf2654a + 0362dc6 commit 14bab38

File tree

3 files changed

+5
-25
lines changed

3 files changed

+5
-25
lines changed

docs/.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ ADDRESS=mailu.io
33

44
# Current versions
55
DEVELOPMENT=master
6-
STABLE=1.7
7-
OLD_STABLE=1.8
6+
STABLE=1.8
7+
OLD_STABLE=1.7
88
LEGACY=1.6

setup/.env

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ ADDRESS=setup.mailu.io
33

44
# Current versions
55
DEVELOPMENT=master
6-
TESTING=1.8
7-
STABLE=1.7
6+
STABLE=1.8

setup/docker-compose.yml

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ services:
1818
environment:
1919
stable_version: ${STABLE}
2020
this_version: ${DEVELOPMENT}
21-
VERSIONS: ${STABLE},${TESTING},${DEVELOPMENT}
21+
VERSIONS: ${STABLE},${DEVELOPMENT}
2222
labels:
2323
- traefik.enable=true
2424
- traefik.port=80
@@ -28,25 +28,6 @@ services:
2828
- redis
2929
restart: always
3030

31-
testing:
32-
image: mailu/setup:${TESTING}
33-
networks:
34-
- web
35-
- default
36-
env_file: .env
37-
environment:
38-
stable_version: ${STABLE}
39-
this_version: ${TESTING}
40-
VERSIONS: ${STABLE},${TESTING},${DEVELOPMENT}
41-
labels:
42-
- traefik.enable=true
43-
- traefik.port=80
44-
- traefik.docker.network=web
45-
- traefik.main.frontend.rule=Host:${ADDRESS};PathPrefix:/${TESTING}
46-
depends_on:
47-
- redis
48-
restart: always
49-
5031
stable:
5132
image: mailu/setup:${STABLE}
5233
networks:
@@ -56,7 +37,7 @@ services:
5637
environment:
5738
stable_version: ${STABLE}
5839
this_version: ${STABLE}
59-
VERSIONS: ${STABLE},${TESTING},${DEVELOPMENT}
40+
VERSIONS: ${STABLE},${DEVELOPMENT}
6041
labels:
6142
- traefik.enable=true
6243
- traefik.port=80

0 commit comments

Comments
 (0)