Merge pull request #1 from github/wth-updates

Updates for what-the-hack

Author: GeekTrainer

src/.dockerignore .dockerignoresrc/.dockerignore renamed to .dockerignore

@@ -43,7 +43,7 @@ ENV NODE_ENV production
 RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nextjs
 
-COPY --from=builder /app/public ./public
+COPY --from=builder /app/src/public ./public
 
 # Automatically leverage output traces to reduce image size
 # https://nextjs.org/docs/advanced-features/output-file-tracing

src/Dockerfile Dockerfilesrc/Dockerfile renamed to Dockerfile

@@ -2,9 +2,9 @@
 
 This repository contains the project for both a guided workshop and the Modern DevOps with GitHub What The Hack. The project is a Next.js app that uses MongoDB for the database. The design is to be used as a walk-through of GitHub features, including [Codespaces](https://docs.github.com/en/codespaces/overview), [Actions](https://docs.github.com/en/actions/learn-github-actions) and [GitHub Advanced Security (GHAS)](https://docs.github.com/en/github/getting-started-with-github/about-github-advanced-security). You'll explore how to use these features to implement and improve your organization's DevOps processes.
 
-## Requirements
+## Getting started
 
-This project uses Node.js for the application and MongoDB for the database. You can [install locally MongoDB](https://www.mongodb.com/docs/manual/administration/install-community/) or use a cloud based provider of your choosing.
+**[Get started learning about development and DevOps with GitHub!](./content/README.md)**
 
 ## License 
 

README.md

@@ -145,7 +145,7 @@ resource containerApp 'Microsoft.App/containerApps@2022-03-01' = {
             }
           ]
           resources: {
-            cpu: '1'
+            cpu: '0.5'
             memory: '1.0Gi'
           }
         }

config/main.bicep

@@ -0,0 +1,32 @@
+# Exploring modern DevOps
+
+This repository is built as a resource for developers and other DevOps professionals to build core skills on creating and deploying software with GitHub. The repository contains an application written using [Next.js](https://nextjs.org/) with a [MongoDB](https://www.mongodb.com/) backend, and the beginnings of end-to-end testing with [Cypress](https://www.cypress.io/).
+
+## Required resources
+
+### Local development
+
+To run the project locally, you will need the following resources:
+
+- [Node.js](https://nodejs.org/)
+- [MongoDB](https://www.mongodb.com/try/download/community)
+
+Alternatively, you could use a [dev container](https://code.visualstudio.com/docs/devcontainers/containers) by moving the [.devcontainer solution](./what-the-hack/Coach/.devcontainer) folder to the root of the project and opening the project with [Visual Studio Code](https://code.visualstudio.com/).
+
+### Cloud deployment
+
+The workshop contains the necessary files to deploy the project to [Azure Container Apps](https://learn.microsoft.com/azure/container-apps/overview) with a [Azure Cosmos DB for MongoDB](https://learn.microsoft.com/azure/cosmos-db/mongodb/introduction) backend. You can use your Azure account to perform these steps, or [create a trial](https://azure.microsoft.com/free/).
+
+## Formats
+
+### Challenge-based
+
+Many learners find the best results if they explore technology by performing the tasks without step-by-step instructions. To support this style, we have built a workshop using a format modeled from Microsoft's What the Hack. A set of challenges is provided in the [Student folder](./what-the-hack/Student/), where you begin by first opening the project and progressing through a set of tasks typical of a developer using DevOps processes.
+
+**[Begin the challenge-based workshop!](./what-the-hack/README.md)**
+
+> The [Coach folder](./what-the-hack/Coach/) contains the solution. This is to be used by the mentors at your event, or if you get stuck.
+
+### Step-by-step
+
+A [step-by-step workshop](./guided-workshop/) is currently being built.

content/README.md

@@ -0,0 +1,25 @@
+FROM mcr.microsoft.com/devcontainers/javascript-node:0-18
+
+# Install MongoDB command line tools - though mongo-database-tools not available on arm64
+ARG MONGO_TOOLS_VERSION=6.0
+RUN . /etc/os-release \
+    && curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \
+    && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian ${VERSION_CODENAME}/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \
+    && apt-get update && export DEBIAN_FRONTEND=noninteractive \
+    && apt-get install -y mongodb-mongosh \
+    && if [ "$(dpkg --print-architecture)" = "amd64" ]; then apt-get install -y mongodb-database-tools; fi \
+    && apt-get clean -y && rm -rf /var/lib/apt/lists/*
+
+# [Optional] Uncomment this section to install additional OS packages.
+# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+#     && apt-get -y install --no-install-recommends <your-package-list-here>
+
+# [Optional] Uncomment if you want to install an additional version of node using nvm
+# ARG EXTRA_NODE_VERSION=10
+# RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}"
+
+# [Optional] Uncomment if you want to install more global node modules
+# RUN su node -c "npm install -g <your-package-list-here>"
+
+
+

content/what-the-hack/Coach/.devcontainer/Dockerfile

@@ -0,0 +1,35 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/javascript-node-mongo
+{
+	"name": "Node.js & Mongo DB",
+	"dockerComposeFile": "docker-compose.yml",
+	"service": "app",
+	"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+
+	// Configure tool-specific properties.
+	"customizations": {
+		// Configure properties specific to VS Code.
+		"vscode": {
+			// Add the IDs of extensions you want installed when the container is created.
+			"extensions": [
+				"mongodb.mongodb-vscode"
+			]
+		}
+	},
+	"features": {
+		"ghcr.io/devcontainers/features/azure-cli:1": {},
+		"ghcr.io/devcontainers/features/github-cli:1": {}
+	}
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [3000, 27017],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "yarn install",
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}

content/what-the-hack/Coach/.devcontainer/devcontainer.json

@@ -0,0 +1,36 @@
+version: '3.8'
+
+services:
+  app:
+    build: 
+      context: .
+      dockerfile: Dockerfile
+    volumes:
+      - ../..:/workspaces:cached
+
+    # Overrides default command so things don't shut down after the process ends.
+    command: sleep infinity
+
+    # Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function.
+    network_mode: service:db
+
+    # Use "forwardPorts" in **devcontainer.json** to forward an app port locally. 
+    # (Adding the "ports" property to this file will not forward from a Codespace.)
+
+  db:
+    image: mongo:latest
+    restart: unless-stopped
+    volumes:
+      - mongodb-data:/data/db
+
+    # Uncomment to change startup options
+    # environment:
+    #  MONGO_INITDB_ROOT_USERNAME: root
+    #  MONGO_INITDB_ROOT_PASSWORD: example
+    #  MONGO_INITDB_DATABASE: your-database-here
+
+    # Add "forwardPorts": ["27017"] to **devcontainer.json** to forward MongoDB locally.
+    # (Adding the "ports" property to this file will not forward from a Codespace.)
+
+volumes:
+  mongodb-data:

content/what-the-hack/Coach/.devcontainer/docker-compose.yml

@@ -0,0 +1,53 @@
+# What The Hack - Modern development and DevOps with GitHub
+
+## Introduction
+
+Welcome to the coach's guide for the Modern development and DevOps with GitHub What The Hack. Here you will find links to specific guidance for coaches for each of the challenges.
+
+> **NOTE:** If you are a Hackathon participant, this is the answer guide. Don't cheat yourself by looking at these during the hack! Go learn something. :)
+
+## Coach's Guides
+
+- [Challenge 0](./Coach/solution00.md) - Setup and Introduction
+- [Challenge 1](./Coach/solution01.md) - Configure your development environment
+- [Challenge 2](./Coach/solution02.md) - Add a feature to the existing application
+- [Challenge 3](./Coach/solution03.md) - Setup continuous integration and ensure security
+- [Challenge 4](./Coach/solution04.md) - Create a deployment environment
+- [Challenge 5](./Coach/solution05.md) - Setup continuous deployment
+
+## Coach Prerequisites
+
+This hack has pre-reqs that a coach is responsible for understanding and/or setting up BEFORE hosting an event. Please review the [What The Hack Hosting Guide](https://aka.ms/wthhost) for information on how to host a hack event.
+
+The guide covers the common preparation steps a coach needs to do before any What The Hack event, including how to properly configure Microsoft Teams.
+
+### Coach notes
+
+- DevOps is a large topic, one which students can explore many aspects. Feel free to have conversations with teams about different approaches. Allow them to explore as they like.
+
+### Student Resources
+
+- The [student resources folder](../Student/resources/) contains a copy of a possible solution for the React component for [Challenge 2 - Add a feature to the existing application](../Student/challenge02.md). Students are welcome to copy/paste this file if they don't feel comfortable coding.
+
+> **NOTE:** Always refer students to the [What The Hack website](https://aka.ms/wth) for the student guide. Students should **not** be given a link to the What The Hack repo before or during a hack. The student guide does **NOT** have any links to the Coach's guide or the What The Hack repo on GitHub.
+
+## Azure Requirements
+
+This hack requires students to have access to an Azure subscription where they can create and consume Azure resources. These Azure requirements should be shared with a stakeholder in the organization that will be providing the Azure subscription(s) that will be used by the students.
+
+- Attendees should have the “Azure account administrator” (or "Owner") role on the Azure subscription in order to authenticate, create and configure the resource group and necessary resources including:
+    - Serverless Cosmos DB with Mongo API
+    - Azure Container App with supporting services
+
+> **NOTE:** A [bicep file](../Student/resources/main.bicep) is provided to create the necessary Azure resources
+
+## Repository Contents
+
+- `./Coach`
+  - Coach's Guide and related files
+- `./Coach/Solutions`
+  - Solution files with completed example answers to a challenge
+- `./Student`
+  - Student's Challenge Guide
+- `./Student/Resources`
+  - Resource files, sample code, scripts, etc meant to be provided to students. (Must be packaged up by the coach and provided to students at start of event)

content/what-the-hack/Coach/README.md

@@ -0,0 +1,24 @@
+on: [workflow_dispatch]
+name: Create Azure resources
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+    steps:
+
+      # Checkout code
+    - uses: actions/checkout@main
+
+      # Log into Azure
+    - uses: azure/login@v1
+      with:
+        creds: ${{ secrets.AZURE_CREDENTIALS }}
+
+      # Deploy Bicep file
+    - name: create resources
+      uses: azure/arm-deploy@v1
+      with:
+        subscriptionId: ${{ secrets.AZURE_SUBSCRIPTION }}
+        resourceGroupName: ${{ secrets.AZURE_RG }}
+        template: ${{ github.workspace }}/config/main.bicep
+        parameters: 'namePrefix=${{ secrets.AZURE_PREFIX }}'
+        failOnStdErr: false