Move from docker-based to standalone Jurassic Tube setup #9839
+40
−14
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
timur27
commented
Nov 28, 2024
bin/jurassic-tube-setup.sh
Outdated
| # Download the installer only if it's not already present | ||
| if [ ! -f "$JT_DIR/installer.sh" ]; then | ||
| echo "Downloading the standalone installer..." | ||
| curl "https://jurassic.tube/installer-standalone.sh" -o "$JT_DIR/installer.sh" && chmod +x "$JT_DIR/installer.sh" |
There was a problem hiding this comment.
We no longer need to provide the environment value, freeing us from coupling it to the product and avoiding the addition of new environments to JT with each new product.
Test the buildOption 1. Jetpack Beta
Option 2. Jurassic Ninja - available for logged-in A12s🚀 Launch a JN site with this branch 🚀 ℹ️ Install this Tampermonkey script to get more options. Build info:
Note: the build is updated when a new commit is pushed to this PR. |
|
Size Change: 0 B Total Size: 1.34 MB ℹ️ View Unchanged
|
timur27
commented
Nov 28, 2024
package.json
Outdated
| @@ -69,8 +69,8 @@ | |||
| "format:css": "npm run format:provided '**/*.scss' '**/*.css'", | |||
| "format:provided": "prettier --write", | |||
| "tube:setup": "./bin/jurassic-tube-setup.sh", | |||
| "tube:start": "./docker/bin/jt/tunnel.sh", | |||
| "tube:stop": "./docker/bin/jt/tunnel.sh break", | |||
| "tube:start": "source ./bin/jurassictube/config.env && jurassictube -u \"$username\" -s \"$subdomain\" -h localhost:8082", | |||
There was a problem hiding this comment.
Hardcoded the port for now because getting it from docker-compose.yml was not readable enough to include it in the setup script, but I'm happy to hear other thoughts.
timur27
commented
Nov 29, 2024
Comment on lines
+46
to
+50
| if [ ! -f "${JT_DIR}/config.env" ]; then | ||
| touch "${JT_DIR}/config.env" | ||
| else | ||
| > "${JT_DIR}/config.env" | ||
| fi |
There was a problem hiding this comment.
creating the config.env file first to store the props needed to start JT
timur27
commented
Nov 29, 2024
bin/jurassic-tube-setup.sh
Outdated
Comment on lines
52
to
61
| # Find the WordPress container section and get its port | ||
| CLIENT_WORDPRESS_CONTAINER_SECTION=$(grep -A 20 "container_name: woocommerce_payments_wordpress" ${PWD}/docker-compose.yml) | ||
| PORTS_LINE=$(echo "${CLIENT_WORDPRESS_CONTAINER_SECTION}" | grep "ports:" -A 1 | grep "\-") | ||
| PORT=$(echo "${PORTS_LINE}" | grep -o '"[0-9]\+:' | cut -d'"' -f2 | cut -d: -f1) | ||
|
|
||
| # Use default if extraction failed | ||
| if [ -z "$PORT" ]; then | ||
| PORT=8082 # Default fallback | ||
| echo "Could not extract WordPress container port, using default: ${PORT}" | ||
| fi |
There was a problem hiding this comment.
Getting the localhost port and falling back to 8082 if an attempt to retrieve it was unsuccessful
timur27
commented
Nov 29, 2024
Comment on lines
+72
to
+73
| "tube:start": "source ./bin/jurassictube/config.env && jurassictube -u \"$username\" -s \"$subdomain\" -h \"$localhost\"", | ||
| "tube:stop": "source ./bin/jurassictube/config.env && jurassictube -b -s \"$subdomain\"", |
There was a problem hiding this comment.
Following the docs on how to use the tool PCYsg-GJ2-p2
timur27
requested review from
a team and
FangedParakeet
and removed request for
a team
achyuthajoy
requested changes
Dec 9, 2024
bin/jurassic-tube-setup.sh
Outdated
Comment on lines
53
to
55
| CLIENT_WORDPRESS_CONTAINER_SECTION=$(grep -A 20 "container_name: woocommerce_payments_wordpress" ${PWD}/docker-compose.yml) | ||
| PORTS_LINE=$(echo "${CLIENT_WORDPRESS_CONTAINER_SECTION}" | grep "ports:" -A 1 | grep "\-") | ||
| PORT=$(echo "${PORTS_LINE}" | grep -o '"[0-9]\+:' | cut -d'"' -f2 | cut -d: -f1) |
There was a problem hiding this comment.
@timur27 I believe you're trying to extract the wordpress container port from docker-compose.yml. Instead of fetching it from the file, we can use something like this - $(docker ps | grep transact_gateway_wordpress | sed -En "s/.*0:([0-9]+).*/\1/p")
There was a problem hiding this comment.
achyuthajoy
approved these changes
Dec 11, 2024
There was a problem hiding this comment.
@timur27 Tested the changes and works as expected. Thanks for working on this.
I have left a minor comment though and approved the PR :D
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related to https://github.com/Automattic/transact-gateway/pull/460
Changes proposed in this Pull Request
This PR switched from Docker-based JT setup to the standalone version of it. More details in paJDYF-fSK-p2
Testing instructions
npm run tube:setupshould run w/o errors, together with usingnpm run tube:startandnpm run tube:stop/jurassictubedirectory should be created under/bindirectory, and should be ignored by gitconfig.envfile does not have duplicated keys but instead, contains only rows relevant to the most recent setupnpm run changelogto add a changelog file, choosepatchto leave it empty if the change is not significant. You can add multiple changelog files in one PR by running this command a few times.Post merge