Skip to content

Commit c8ccde3

Browse files
authored
Merge branch 'zodern:master' into master
2 parents 29a76c5 + fcf2c23 commit c8ccde3

File tree

26 files changed

+2307
-3478
lines changed

26 files changed

+2307
-3478
lines changed

.github/workflows/test.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,16 @@ jobs:
4242
fail-fast: false
4343
matrix:
4444
include:
45-
- nodeVersion: 8.x
45+
- nodeVersion: 10.x
4646
testPlugins: "meteor"
4747
testOptions: "--non-root"
48-
- nodeVersion: 8.x
48+
- nodeVersion: 10.x
4949
testPlugins: "docker,mongo,proxy,default"
5050
testOptions: "--non-root"
51-
- nodeVersion: 14.x
51+
- nodeVersion: 22.x
5252
testPlugins: "meteor"
5353
testOptions: ""
54-
- nodeVersion: 14.x
54+
- nodeVersion: 22.x
5555
testPlugins: "docker,mongo,proxy,default"
5656
testOptions: ""
5757
steps:
@@ -66,6 +66,9 @@ jobs:
6666
- name: Install npm dependencies
6767
run: npm ci
6868

69+
- name: Free up space
70+
run: sudo rm -rf /usr/local/lib/android
71+
6972
- name: Run tests
7073
env:
7174
TEST_PLUGINS: ${{ matrix.testPlugins }}

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
## 1.5.11 - October 21, 2024
2+
3+
- Node 8 is no longer supported. The minimum node version is 10.16
4+
- Fix issues with deploying in Node 20.10 and newer
5+
- Fix some ssh issues
6+
- Add support for MongodB 6 and newer (@bessw)
7+
- Add `mongo.dataPath` option
8+
- When there is a connection issue with SSH, the error now includes the hostname of the server
9+
- Fix running `mup proxy reconfig-shared` when shared nginx config is not configured
10+
111
## 1.5.10 - January 25, 2022
212

313
- Support relative paths for proxy.shared.nginxConfig (@sitiarel)

docs/.stylelintrc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,8 @@
33
"ignoreFiles": [
44
"css/tocbot.css",
55
"css/highlight.css"
6-
]
6+
],
7+
"rules": {
8+
"media-feature-range-notation": null
9+
}
710
}

docs/css/base.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ body {
33
padding: 0;
44
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
55
background-color: #1c2126;
6-
background-image: url(../imgs/space-bg-shadowcodex.jpg);
6+
background-image: url("../imgs/space-bg-shadowcodex.jpg");
77
background-attachment: fixed;
88
background-size: cover;
99
color: white;

docs/css/docs.css

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#docs-head {
22
padding-top: 50px;
33
display: flex;
4-
background-color: rgba(28, 33, 38, 0.3);
4+
background-color: rgb(28 33 38 / 30%);
55
height: 100px;
66
align-items: center;
77
justify-content: center;
@@ -14,7 +14,7 @@
1414
}
1515

1616
.docs-wrapper {
17-
background: rgba(28, 33, 38, 1);
17+
background: rgb(28 33 38 / 100%);
1818
display: flex;
1919
flex-direction: row-reverse;
2020
}
@@ -24,7 +24,7 @@
2424
min-width: 250px;
2525
padding: 0 50px;
2626
margin: 0 auto;
27-
background: rgba(28, 33, 38, 1);
27+
background: rgb(28 33 38 / 100%);
2828
}
2929

3030
.docs-content h2 {
@@ -99,7 +99,7 @@
9999

100100
a.toc-link {
101101
text-decoration: none;
102-
color: rgba(256, 256, 256, 0.8);
102+
color: rgb(256 256 256 / 80%);
103103
}
104104

105105
.is-active-link {
@@ -147,7 +147,7 @@ a.toc-link {
147147
.docs-content table td {
148148
padding: 10px 5px;
149149
font-size: 14px;
150-
border-bottom: 1px solid rgba(256, 256, 256, 0.2);
150+
border-bottom: 1px solid rgb(256 256 256 / 20%);
151151
}
152152

153153
.docs-content table tr:last-child td {
@@ -179,7 +179,7 @@ a.toc-link {
179179
width: 100%;
180180
text-align: center;
181181
cursor: pointer;
182-
background: rgba(28, 33, 38, 1);
182+
background: rgb(28 33 38 / 100%);
183183
}
184184

185185
.docs-nav-wrapper .close {
@@ -192,7 +192,7 @@ a.toc-link {
192192
width: 30px;
193193
height: 30px;
194194
z-index: 15;
195-
background: rgba(0, 0, 0, 0.5);
195+
background: rgb(0 0 0 / 50%);
196196
padding: 6px;
197197
cursor: pointer;
198198
}

docs/css/index.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
vertical-align: top;
66
height: 140px;
77
background: white;
8-
color: rgb(28, 31, 35);
8+
color: rgb(28 31 35);
99
border-radius: 1px;
1010
padding: 20px;
1111
margin: 0 20px 20px 0;
@@ -48,7 +48,7 @@
4848
justify-content: center;
4949
align-items: center;
5050
flex-direction: column;
51-
background: linear-gradient(180deg, rgba(27, 27, 27, 0) 0%, rgba(28, 31, 35, 0.79) 71.75%, rgb(28, 33, 38) 100%);
51+
background: linear-gradient(180deg, rgb(27 27 27 / 0%) 0%, rgb(28 31 35 / 79%) 71.75%, rgb(28 33 38) 100%);
5252
}
5353

5454
#hero .content {
@@ -126,7 +126,7 @@
126126
#community {
127127
padding: 50px 100px 100px;
128128
background: #ffffffa1;
129-
color: rgb(28, 31, 35);
129+
color: rgb(28 31 35);
130130
}
131131

132132
#community .content {

docs/docs.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,12 @@ module.exports = {
249249
// (optional, default is 3.4.1) Version of MongoDB
250250
version: '3.4.1',
251251

252+
// (optional, default is the name of the app)
253+
dbName: 'maps',
254+
255+
// (optional, default is /var/lib/mongodb) Folder to store the mongodb data
256+
dataPath: '/var/lib/mongodb',
257+
252258
servers: {
253259
one: {}
254260
}
@@ -293,7 +299,7 @@ Mup supports Meteor 1.2 and newer, though you might need to change the docker im
293299
| Meteor version | Docker image | Prepare Bundle | Notes |
294300
| --- | --- | --- |
295301
| 1.2 - 1.3 | `kadirahq/meteord` | false | This is the default docker image. When using Meteor 1.2, `app.buildOptions.serverOnly` should be false. |
296-
| 1.2 - 2.6 and newer | `zodern/meteor:root` | true | Automatically uses the correct node version for the app's Meteor version. |
302+
| 1.2 - 3.0 and newer | `zodern/meteor:root` | true | Automatically uses the correct node version for the app's Meteor version. |
297303
| 1.4 - 1.5 | `abernix/meteord:node-4-base` | true | |
298304
| 1.6 - 1.8| `abernix/meteord:node-8-base` | true | |
299305
| 1.9 - 2.2 | `abernix/meteord:node-12-base` | true | |

0 commit comments

Comments
 (0)