Update repo to use new labspace content repo layout

Author: mikesir87

.github/workflows/publish-labspace.yaml

@@ -22,6 +22,6 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Publish Labspace
-        uses: dockersamples/publish-labspace-action@v1
+        uses: dockersamples/publish-labspace-action@v2
         with:
           target_repo: ${{ env.DOCKERHUB_REPO }}

README.md

@@ -1,48 +1,41 @@
-# Labspace starter
+# DHI Node Labspace
 
-This repository is intended to server as a template to help bootstrap a new Labspace.
+This lab outlines the benefits of Docker Hardened Images and walks you through the migration process for the Node application.
 
-## Instructions
+## Launch the Labspace
 
-1. Create a new repository using this repo as the template ([docs here](https://docs.github.com/en/repositories/creating-and-managing-repositories/creating-a-repository-from-a-template)).
+To launch the Labspace, run the following command:
 
-    **NOTE:** After creating the repo, a GHA workflow will run to do some additional bootstrapping. The bootstrapping workflow file will be removed during bootstrapping.
+```bash
+docker compose -f oci://dockersamples/labspace-dhi-node up -d
+```
 
-2. Clone your newly created repo to your local machine
+And then open your browser to http://localhost:3030.
 
-3. Start the local development mode:
+### Using the Docker Desktop extension
 
-    ```bash
-    # On Mac/Linux
-    CONTENT_PATH=$PWD docker compose -f oci://dockersamples/labspace-content-dev -f .labspace/compose.override.yaml up
-
-    # On Windows with PowerShell
-    $Env:CONTENT_PATH = (Get-Location).Path; docker compose -f oci://dockersamples/labspace-content-dev -f .labspace/compose.override.yaml up
-    ```
-
-4. Update the `labspace.yaml` with your Labspace's title and description
-
-5. Write your Labspace! Being in dev mode, your changes should be visible in the interface without a restart. Feel free to edit either on your host machine or in the Labspace itself!
-
-    Add any supporting application files or resources directly into the Labspace. This repo will be cloned into the Labspace at startup.
+If you have the Labspace extension installed (`docker extension install dockersamples/labspace-extension` if not), you can also [click this link](https://open.docker.com/dashboard/extension-tab?extensionId=dockersamples/labspace-extension&location=dockersamples/labspace-dhi-node&title=DHI%20Node) to launch the Labspace.
 
-    Be sure to check out the [docs](https://github.com/dockersamples/labspace-infra/tree/main/docs) for additional information and guidelines.
+## Contributing
 
+If you find something wrong or something that needs to be updated, feel free to submit a PR. If you want to make a larger change, feel free to fork the repo into your own repository.
 
+**Important note:** If you fork it, you will need to update the GHA workflow to point to your own Hub repo.
 
-### Setting up the deployment pipeline
+1. Clone this repo
 
-The template repo contains a workflow file to make it easy to publish your Labspace.
+2. Start the Labspace in content development mode:
 
-1. Add GitHub Action Secrets in your new repo for the following:
+    ```bash
+    # On Mac/Linux
+    CONTENT_PATH=$PWD docker compose up --watch
 
-    - `DOCKERHUB_USERNAME` - the username to authenticate to Docker Hub with
-    - `DOCKERHUB_TOKEN` - a personal or organization access token to use for authentication
+    # On Windows with PowerShell
+    $Env:CONTENT_PATH = (Get-Location).Path; docker compose up --watch
+    ```
 
-2. In the `.github/workflows/publish-labspace.yaml.temp` file, update the `DOCKERHUB_REPO` with the name of the Docker Hub repo you want to publish to.
+3. Open the Labspace at http://dockerlabs.xyz.
 
-3. Rename the workflow file to remove the `.temp` extension.
+4. Make the necessary changes and validate they appear as you expect in the Labspace
 
-    ```bash
-    mv .github/workflows/publish-labspace.yaml.temp .github/workflows/publish-labspace.yaml
-    ```
+    Be sure to check out the [docs](https://github.com/dockersamples/labspace-infra/tree/main/docs) for additional information and guidelines.

.labspace/compose.override.yaml compose.override.yaml.labspace/compose.override.yaml renamed to compose.override.yaml

@@ -0,0 +1,3 @@
+include:
+  - oci://dockersamples/labspace-content-dev
+  - ./compose.override.yaml

compose.yaml

@@ -5,7 +5,7 @@
 Go to the [Node DHI page](https://hub.docker.com/orgs/$$orgname$$/hardened-images/catalog/dhi/node) and click on the `Mirror to repository` button.
 
 In the opened pop-up set the name of the destination repository to `dhi-node`  
-![Mirror Node DHI](.labspace/images/mirror-node.png)  
+![Mirror Node DHI](images/mirror-node.png)  
 
 Click on Mirror. In a few minutes you'll see all available Node DHI tags in your `dhi-node` repository in the Docker Hub. Mirrored repositories work like any other repository in your Docker Hub organization.