Skip to content

Commit

Permalink
3.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
GeoffreyBooth committed Feb 8, 2025
1 parent 864c938 commit c4d8724
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 13 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 @@ -72,6 +72,7 @@ jobs:
- '3.0.4'
- '3.1'
- '3.1.1'
- '3.1.2'

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.1.1:
For example, if your project is running under Meteor 3.1.2:

```Dockerfile
FROM geoffreybooth/meteor-base:3.1.1
FROM geoffreybooth/meteor-base:3.1.2
```

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.1.1
FROM geoffreybooth/meteor-base:3.1.2

# 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.1.1
FROM node:22.13.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.2
FROM node:22.13.1-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:22.13.0-alpine
FROM node:22.13.1-alpine

ENV APP_BUNDLE_FOLDER=/opt/bundle
ENV SCRIPTS_FOLDER=/docker
Expand Down
2 changes: 1 addition & 1 deletion example/app/.meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[email protected].1
[email protected].2
4 changes: 2 additions & 2 deletions example/app/.meteor/versions
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ [email protected]
[email protected]
[email protected]
[email protected]
modern-browsers@0.1.11
modern-browsers@0.2.0
[email protected]
[email protected]
[email protected]
Expand All @@ -65,5 +65,5 @@ [email protected]
[email protected]
[email protected]
[email protected]
[email protected].4
[email protected].5
[email protected]
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.1.1
FROM geoffreybooth/meteor-base:3.1.2

# 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.1.1
FROM node:22.13.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.2
FROM node:22.13.1-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 @@ -91,6 +91,7 @@ set_node_version() {
elif [[ "$1" == 3.0.4 ]]; then node_version='20.18.0'
elif [[ "$1" == 3.1 ]]; then node_version='22.11.0'
elif [[ "$1" == 3.1.1 ]]; then node_version='22.13.0'
elif [[ "$1" == 3.1.2 ]]; then node_version='22.13.1'
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 @@ -61,5 +61,6 @@ meteor_versions=( \
'3.0.3' \
'3.0.4' \
'3.1' \
'3.1.1'
'3.1.1' \
'3.1.2'
)

0 comments on commit c4d8724

Please sign in to comment.