Skip to content

Commit

Permalink
feat: add 3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
wolasss committed Nov 26, 2024
1 parent 151fc5d commit 88bf966
Show file tree
Hide file tree
Showing 11 changed files with 46 additions and 42 deletions.
1 change: 1 addition & 0 deletions .github/workflows/continuous-integration-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ jobs:
- '3.0.2'
- '3.0.3'
- '3.0.4'
- '3.1'

steps:
- name: Checkout
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ Copy `example/default.dockerfile` (or `example/app-with-native-dependencies.dock

Edit the `Dockerfile` you copied into your project, changing the first line so that the numbers at the end match the version of Meteor of your project. You can find your project’s Meteor version in your app’s `.meteor/release` file.

For example, if your project is running under Meteor 3.0.4:
For example, if your project is running under Meteor 3.1:

```Dockerfile
FROM geoffreybooth/meteor-base:3.0.4
FROM geoffreybooth/meteor-base:3.1
```

This version must match an available tag from [geoffreybooth/meteor-base](https://hub.docker.com/r/geoffreybooth/meteor-base/tags).
Expand Down
8 changes: 4 additions & 4 deletions example/app-with-native-dependencies.dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# The tag here should match the Meteor version of your app, per .meteor/release
FROM geoffreybooth/meteor-base:3.0.4
FROM geoffreybooth/meteor-base:3.1

# Copy app package.json and package-lock.json into container
COPY ./app/package*.json $APP_SOURCE_FOLDER/
Expand All @@ -12,8 +12,8 @@ COPY ./app $APP_SOURCE_FOLDER/
RUN bash $SCRIPTS_FOLDER/build-meteor-bundle.sh


# Use the specific version of Node expected by your Meteor release, per https://docs.meteor.com/changelog.html; this is expected for Meteor 3.0.4
FROM node:20.18.0-alpine
# Use the specific version of Node expected by your Meteor release, per https://docs.meteor.com/changelog.html; this is expected for Meteor 3.1
FROM node:22.11.0-alpine

ENV APP_BUNDLE_FOLDER=/opt/bundle
ENV SCRIPTS_FOLDER=/docker
Expand All @@ -36,7 +36,7 @@ RUN bash $SCRIPTS_FOLDER/build-meteor-npm-dependencies.sh --build-from-source

# Start another Docker stage, so that the final image doesn’t contain the layer with the build dependencies
# See previous FROM line; this must match
FROM node:20.18.0-alpine
FROM node:22.11.0-alpine

ENV APP_BUNDLE_FOLDER=/opt/bundle
ENV SCRIPTS_FOLDER=/docker
Expand Down
8 changes: 4 additions & 4 deletions example/app/.meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@

[email protected] # Packages every Meteor app needs to have
[email protected] # Packages for a great mobile UX
[email protected].2 # The database Meteor supports right now
[email protected].3 # The database Meteor supports right now
[email protected] # Reactive variable for tracker

[email protected] # CSS minifier run for production mode
[email protected] # JS minifier run for production mode
[email protected] # ECMAScript 5 compatibility for older browsers
[email protected].9 # Enable ECMAScript2015+ syntax in app code
typescript@5.4.3 # Enable TypeScript syntax in .ts and .tsx modules
[email protected].0 # Server-side component of the `meteor shell` command
[email protected].10 # Enable ECMAScript2015+ syntax in app code
typescript@5.6.3 # Enable TypeScript syntax in .ts and .tsx modules
[email protected].1 # Server-side component of the `meteor shell` command
[email protected] # Update client in development without reloading the page

[email protected] # Publish all data to the clients (for prototyping)
Expand Down
2 changes: 1 addition & 1 deletion example/app/.meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@3.0.4
METEOR@3.1
29 changes: 14 additions & 15 deletions example/app/.meteor/versions
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[email protected]
[email protected]
[email protected]
[email protected].1
[email protected].2
[email protected]
[email protected]
[email protected]
Expand All @@ -11,12 +11,12 @@ [email protected]
[email protected]
[email protected]
[email protected]
[email protected].2
[email protected].3
[email protected]
[email protected].2
[email protected].3
[email protected]
[email protected]
[email protected].9
[email protected].10
[email protected]
[email protected]
[email protected]
Expand All @@ -32,22 +32,22 @@ [email protected]
[email protected]
[email protected]
[email protected]
[email protected].1
[email protected].2
[email protected]
[email protected]
[email protected].0
[email protected].1
[email protected].1
[email protected].2
[email protected]
[email protected]
[email protected]
[email protected].2
[email protected].3
[email protected]
[email protected]
[email protected].2
mongo-decimal@0.1.4-beta300.7
[email protected].3
mongo-decimal@0.2.0
[email protected]
[email protected]
npm-mongo@4.17.4
npm-mongo@6.10.0
[email protected]
[email protected]
[email protected]
Expand All @@ -57,14 +57,13 @@ [email protected]
[email protected]
[email protected]
[email protected]
[email protected].0
[email protected].1
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
22 changes: 12 additions & 10 deletions example/app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions example/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"visualize": "meteor --production --extra-packages bundle-visualizer"
},
"dependencies": {
"@babel/runtime": "^7.25.7",
"meteor-node-stubs": "^1.2.10",
"@babel/runtime": "^7.26.0",
"meteor-node-stubs": "^1.2.12",
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
Expand Down
6 changes: 3 additions & 3 deletions example/default.dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# The tag here should match the Meteor version of your app, per .meteor/release
FROM geoffreybooth/meteor-base:3.0.4
FROM geoffreybooth/meteor-base:3.1

# Copy app package.json and package-lock.json into container
COPY ./app/package*.json $APP_SOURCE_FOLDER/
Expand All @@ -12,8 +12,8 @@ COPY ./app $APP_SOURCE_FOLDER/
RUN bash $SCRIPTS_FOLDER/build-meteor-bundle.sh


# Use the specific version of Node expected by your Meteor release, per https://docs.meteor.com/changelog.html; this is expected for Meteor 3.0.4
FROM node:20.18.0-alpine
# Use the specific version of Node expected by your Meteor release, per https://docs.meteor.com/changelog.html; this is expected for Meteor 3.1
FROM node:22.11.0-alpine

ENV APP_BUNDLE_FOLDER=/opt/bundle
ENV SCRIPTS_FOLDER=/docker
Expand Down
1 change: 1 addition & 0 deletions support.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ set_node_version() {
elif [[ "$1" == 3.0.2 ]]; then node_version='20.15.1'
elif [[ "$1" == 3.0.3 ]]; then node_version='20.17.0'
elif [[ "$1" == 3.0.4 ]]; then node_version='20.18.0'
elif [[ "$1" == 3.1 ]]; then node_version='22.11.0'
fi # End of versions
}

Expand Down
3 changes: 2 additions & 1 deletion versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,6 @@ meteor_versions=( \
'3.0.1' \
'3.0.2' \
'3.0.3' \
'3.0.4'
'3.0.4' \
'3.1'
)

0 comments on commit 88bf966

Please sign in to comment.