@@ -45,33 +45,33 @@ decoupling the module and business logic maintenance and deployment.
45
45
### Docker Images
46
46
47
47
Docker images [ are built] ( https://hub.docker.com/r/mozilla/lua_sandbox_extensions/ ) from
48
- the ` dev ` and ` master ` branches. These images contain [ hindsight] ( https://github.com/mozilla-services/hindsight ) ,
48
+ the ` dev ` and ` main ` branches. These images contain [ hindsight] ( https://github.com/mozilla-services/hindsight ) ,
49
49
[ lua_sandbox] ( https://github.com/mozilla-services/lua_sandbox ) and have all of the extensions
50
50
from this repository installed.
51
51
52
- # Get master branch docker image
53
- docker pull mozilla/lua_sandbox_extensions:master
54
-
52
+ # Get main branch docker image
53
+ docker pull mozilla/lua_sandbox_extensions:main
54
+
55
55
# Get dev branch docker image
56
56
docker pull mozilla/lua_sandbox_extensions:dev
57
57
58
58
## Releases
59
59
60
- * The master branch is the current release and is considered stable at all
60
+ * The main branch is the current release and is considered stable at all
61
61
times.
62
62
* New versions can be released as frequently as every two weeks (our sprint
63
63
cycle). The only exception would be for a high priority patch.
64
64
* All active work is flagged with the sprint milestone and tracked in the
65
65
project dashboard.
66
66
* New releases occur the day after the sprint finishes.
67
67
* The version in the dev branch is updated
68
- * The changes are merged into master
68
+ * The changes are merged into main
69
69
* A new tag is created
70
70
71
71
## Contributions
72
72
73
73
* All pull requests must be made against the dev branch, direct commits to
74
- master are not permitted.
74
+ main are not permitted.
75
75
* All non trivial contributions should start with an issue being filed (if it is
76
76
a new feature please propose your design/approach before doing any work as not
77
77
all feature requests are accepted).
0 commit comments