From 4e168fc8e9441cdcba17126c5c251d4346bb6bea Mon Sep 17 00:00:00 2001 From: Jon Edvald Date: Sun, 17 Jan 2021 21:01:54 +0100 Subject: [PATCH] chore(examples): rename jworker/javaworker modules to worker --- docs/advanced/using-remote-sources.md | 8 ++++---- examples/remote-sources/README.md | 2 +- examples/remote-sources/{jworker => worker}/garden.yml | 4 ++-- examples/vote/README.md | 2 +- examples/vote/{jworker => worker}/Dockerfile | 0 examples/vote/{jworker => worker}/garden.yml | 4 ++-- examples/vote/{jworker => worker}/pom.xml | 0 .../{jworker => worker}/src/main/java/worker/Worker.java | 0 8 files changed, 10 insertions(+), 10 deletions(-) rename examples/remote-sources/{jworker => worker}/garden.yml (84%) rename examples/vote/{jworker => worker}/Dockerfile (100%) rename examples/vote/{jworker => worker}/garden.yml (89%) rename examples/vote/{jworker => worker}/pom.xml (100%) rename examples/vote/{jworker => worker}/src/main/java/worker/Worker.java (100%) diff --git a/docs/advanced/using-remote-sources.md b/docs/advanced/using-remote-sources.md index b1cf24d399..414c648730 100644 --- a/docs/advanced/using-remote-sources.md +++ b/docs/advanced/using-remote-sources.md @@ -70,14 +70,14 @@ services: You can import the source code for a _single_ Garden module from another repository via the `repositoryUrl` directive in the module-level `garden.yml` like so: ```yaml -# examples/remote-sources/jworker/garden.yml +# examples/remote-sources/worker/garden.yml kind: Module description: Java Worker type: container -name: jworker repositoryUrl: https://github.com/garden-io/garden-example-remote-module-jworker.git#v0.1.0 +name: worker services: - - name: jworker + - name: worker ... ``` @@ -91,7 +91,7 @@ $ tree . . ├── garden.yml -└── jworker +└── worker └── garden.yml ``` diff --git a/examples/remote-sources/README.md b/examples/remote-sources/README.md index 52553aa406..3565d74f1b 100644 --- a/examples/remote-sources/README.md +++ b/examples/remote-sources/README.md @@ -20,7 +20,7 @@ garden deploy ``` Garden will continue to use the version originally downloaded. Use the `update-remote sources|modules|all` command to fetch the latest version of your remote sources and modules: ```sh -garden update-remote modules jworker +garden update-remote modules worker ``` If you however change the repository URL of your remote source or module (e.g. switch to a different tag or branch), Garden will automatically fetch the correct version. diff --git a/examples/remote-sources/jworker/garden.yml b/examples/remote-sources/worker/garden.yml similarity index 84% rename from examples/remote-sources/jworker/garden.yml rename to examples/remote-sources/worker/garden.yml index badc377299..de95469cfb 100644 --- a/examples/remote-sources/jworker/garden.yml +++ b/examples/remote-sources/worker/garden.yml @@ -1,9 +1,9 @@ kind: Module description: Java Worker type: container -name: jworker +name: worker repositoryUrl: https://github.com/garden-io/garden-example-remote-module-jworker.git#v0.2.0 services: - - name: javaworker + - name: worker dependencies: - redis diff --git a/examples/vote/README.md b/examples/vote/README.md index 1c7ee37efc..d525681cf7 100644 --- a/examples/vote/README.md +++ b/examples/vote/README.md @@ -15,7 +15,7 @@ garden dev Good afternoon! Let's get your environment wired up... ✔ local-kubernetes → Configured -✔ jworker → Building jworker:8bbc389b3e... → Done (took 0.6 sec) +✔ worker → Building worker:8bbc389b3e... → Done (took 0.6 sec) ✔ postgres → Building → Done (took 0.4 sec) ✔ result → Building result:8bbc389b3e... → Done (took 0.5 sec) ✔ vote → Building vote:8bbc389b3e-1543837972... → Done (took 0.5 sec) diff --git a/examples/vote/jworker/Dockerfile b/examples/vote/worker/Dockerfile similarity index 100% rename from examples/vote/jworker/Dockerfile rename to examples/vote/worker/Dockerfile diff --git a/examples/vote/jworker/garden.yml b/examples/vote/worker/garden.yml similarity index 89% rename from examples/vote/jworker/garden.yml rename to examples/vote/worker/garden.yml index da5163c8a8..fcaf025e0e 100644 --- a/examples/vote/jworker/garden.yml +++ b/examples/vote/worker/garden.yml @@ -1,9 +1,9 @@ kind: Module description: The worker that collects votes and stores results in a postgres table type: container -name: jworker +name: worker services: - - name: javaworker + - name: worker dependencies: - redis - db-init diff --git a/examples/vote/jworker/pom.xml b/examples/vote/worker/pom.xml similarity index 100% rename from examples/vote/jworker/pom.xml rename to examples/vote/worker/pom.xml diff --git a/examples/vote/jworker/src/main/java/worker/Worker.java b/examples/vote/worker/src/main/java/worker/Worker.java similarity index 100% rename from examples/vote/jworker/src/main/java/worker/Worker.java rename to examples/vote/worker/src/main/java/worker/Worker.java