Skip to content

Commit

Permalink
feat: add 3.1 (#172)
Browse files Browse the repository at this point in the history
  • Loading branch information
wolasss authored Nov 30, 2024
1 parent 151fc5d commit b1567a8
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 @@

meteor-base@1.5.2 # Packages every Meteor app needs to have
mobile-experience@1.1.2 # Packages for a great mobile UX
mongo@2.0.2 # The database Meteor supports right now
mongo@2.0.3 # The database Meteor supports right now
reactive-var@1.0.13 # Reactive variable for tracker

standard-minifier-css@1.9.3 # CSS minifier run for production mode
standard-minifier-js@3.0.0 # JS minifier run for production mode
es5-shim@4.8.1 # ECMAScript 5 compatibility for older browsers
ecmascript@0.16.9 # Enable ECMAScript2015+ syntax in app code
typescript@5.4.3 # Enable TypeScript syntax in .ts and .tsx modules
shell-server@0.6.0 # Server-side component of the `meteor shell` command
ecmascript@0.16.10 # Enable ECMAScript2015+ syntax in app code
typescript@5.6.3 # Enable TypeScript syntax in .ts and .tsx modules
shell-server@0.6.1 # Server-side component of the `meteor shell` command
hot-module-replacement@0.5.4 # Update client in development without reloading the page

autopublish@1.0.8 # 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 @@
allow-deny@2.0.0
autopublish@1.0.8
autoupdate@2.0.0
babel-compiler@7.11.1
babel-compiler@7.11.2
babel-runtime@1.5.2
base64@1.0.13
binary-heap@1.0.12
Expand All @@ -11,12 +11,12 @@ callback-hook@1.6.0
check@1.4.4
core-runtime@1.0.0
ddp@1.4.2
ddp-client@3.0.2
ddp-client@3.0.3
ddp-common@1.4.4
ddp-server@3.0.2
ddp-server@3.0.3
diff-sequence@1.1.3
dynamic-import@0.7.4
ecmascript@0.16.9
ecmascript@0.16.10
ecmascript-runtime@0.8.3
ecmascript-runtime-client@0.12.2
ecmascript-runtime-server@0.11.1
Expand All @@ -32,22 +32,22 @@ insecure@1.0.8
inter-process-messaging@0.1.2
launch-screen@2.0.1
logging@1.3.5
meteor@2.0.1
meteor@2.0.2
meteor-base@1.5.2
minifier-css@2.0.0
minifier-js@3.0.0
minimongo@2.0.1
minifier-js@3.0.1
minimongo@2.0.2
mobile-experience@1.1.2
mobile-status-bar@1.1.1
modern-browsers@0.1.11
modules@0.20.2
modules@0.20.3
modules-runtime@0.13.2
modules-runtime-hot@0.14.3
mongo@2.0.2
mongo-decimal@0.1.4-beta300.7
mongo@2.0.3
mongo-decimal@0.2.0
mongo-dev-server@1.1.1
mongo-id@1.0.9
npm-mongo@4.17.4
npm-mongo@6.10.0
ordered-dict@1.2.0
promise@1.0.0
random@1.2.2
Expand All @@ -57,14 +57,13 @@ reactive-var@1.0.13
reload@1.3.2
retry@1.1.1
routepolicy@1.1.2
shell-server@0.6.0
shell-server@0.6.1
socket-stream-client@0.5.3
standard-minifier-css@1.9.3
standard-minifier-js@3.0.0
static-html@1.4.0
static-html-tools@1.0.0
tracker@1.3.4
typescript@5.4.3
underscore@1.6.4
webapp@2.0.3
typescript@5.6.3
webapp@2.0.4
webapp-hashing@1.1.2
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 b1567a8

Please sign in to comment.