diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 7a9806a..2615f15 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -72,6 +72,7 @@ jobs: - '3.0.4' - '3.1' - '3.1.1' + - '3.1.2' steps: - name: Checkout diff --git a/README.md b/README.md index d961d3c..c81a551 100644 --- a/README.md +++ b/README.md @@ -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). diff --git a/example/app-with-native-dependencies.dockerfile b/example/app-with-native-dependencies.dockerfile index 1d951e4..4011d48 100644 --- a/example/app-with-native-dependencies.dockerfile +++ b/example/app-with-native-dependencies.dockerfile @@ -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/ @@ -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 @@ -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 diff --git a/example/app/.meteor/release b/example/app/.meteor/release index eaae1a4..5f22892 100644 --- a/example/app/.meteor/release +++ b/example/app/.meteor/release @@ -1 +1 @@ -METEOR@3.1.1 +METEOR@3.1.2 diff --git a/example/app/.meteor/versions b/example/app/.meteor/versions index 0e693ea..9354ea1 100644 --- a/example/app/.meteor/versions +++ b/example/app/.meteor/versions @@ -39,7 +39,7 @@ 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 +modern-browsers@0.2.0 modules@0.20.3 modules-runtime@0.13.2 modules-runtime-hot@0.14.3 @@ -65,5 +65,5 @@ static-html@1.4.0 static-html-tools@1.0.0 tracker@1.3.4 typescript@5.6.3 -webapp@2.0.4 +webapp@2.0.5 webapp-hashing@1.1.2 diff --git a/example/default.dockerfile b/example/default.dockerfile index 5da404b..23391aa 100644 --- a/example/default.dockerfile +++ b/example/default.dockerfile @@ -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/ @@ -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 diff --git a/support.sh b/support.sh index f3f6017..07e3e0d 100644 --- a/support.sh +++ b/support.sh @@ -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 } diff --git a/versions.sh b/versions.sh index 345a800..118647f 100755 --- a/versions.sh +++ b/versions.sh @@ -61,5 +61,6 @@ meteor_versions=( \ '3.0.3' \ '3.0.4' \ '3.1' \ - '3.1.1' + '3.1.1' \ + '3.1.2' )