Skip to content

Commit

Permalink
fix broken test.sh node image replacement logic (#162)
Browse files Browse the repository at this point in the history
* fix broken test.sh node image replacement logic

This fixes tests for PR #161. The test.sh file did not handle swapping in the node image maintained by meteor for version 14.21.4.

* revert whitespace

* missed a new line
  • Loading branch information
donstephan committed Jul 24, 2024
1 parent 46143f4 commit 255ecd1
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,15 @@ for version in "${meteor_versions[@]}"; do

cp "${dockerfile}" test.dockerfile
do_sed "s|FROM geoffreybooth/meteor-base:.*|FROM geoffreybooth/meteor-base:${version}|" test.dockerfile
do_sed "s|FROM node:.*|FROM node:${node_version}-alpine|" test.dockerfile

if [[ $(get_version_string "${node_version}") -ge $(get_version_string 14.21.4) && $(get_version_string "${node_version}") -lt $(get_version_string 18.0.0) ]]; then
echo 'Using Meteor fork of Node Docker image...'
do_sed "s|FROM node:.*|FROM meteor/node:${node_version}-alpine3.17|" test.dockerfile
else
echo 'Using official Node Docker image...'
do_sed "s|FROM node:.*|FROM node:${node_version}-alpine|" test.dockerfile
fi

do_sed "s|/app|/test-app|g" test.dockerfile

cp docker-compose.yml test.docker-compose.yml
Expand Down

0 comments on commit 255ecd1

Please sign in to comment.