Implement branch-specific docker tags in build script and CI workflow

Co-authored-by: alexmickelson <43245625+alexmickelson@users.noreply.github.com>
Initial plan
2026-03-25 23:28:33 -06:00 · 2025-09-29 18:01:33 +00:00 · 2025-09-29 17:44:13 +00:00 · 2025-09-22 10:53:25 -06:00 · 2025-09-22 10:51:13 -06:00 · 2025-09-22 10:48:19 -06:00
5 changed files with 161 additions and 36 deletions
--- a/.github/workflows/docker-deploy.yml
+++ b/.github/workflows/docker-deploy.yml
@@ -2,7 +2,7 @@ name: Deploy to Docker Hub

 on:
  push:
-    branches: [ main ]
+    branches: [ main, development, staging ]

 jobs:
  deploy:
@@ -21,8 +21,11 @@ jobs:
        username: ${{ secrets.DOCKERHUB_USERNAME }}
        password: ${{ secrets.DOCKERHUB_TOKEN }}
    
-    - name: Make build script executable
-      run: chmod +x ./build.sh
+    - name: Extract branch name
+      shell: bash
+      run: echo "BRANCH_NAME=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
    
    - name: Build and push Docker image
-      run: ./build.sh -t -p
+      run: |
+        chmod +x ./build.sh
+        ./build.sh -t -p -b "$BRANCH_NAME"
--- a/build.sh
+++ b/build.sh
@@ -3,11 +3,12 @@
 MAJOR_VERSION="3"
 MINOR_VERSION="0"
 VERSION="$MAJOR_VERSION.$MINOR_VERSION"
+BRANCH=""

 TAG_FLAG=false
 PUSH_FLAG=false

-while getopts ":tp" opt; do
+while getopts ":tpb:" opt; do
  case ${opt} in
    t)
      TAG_FLAG=true
@@ -15,9 +16,12 @@ while getopts ":tp" opt; do
    p)
      PUSH_FLAG=true
      ;;
+    b)
+      BRANCH="$OPTARG"
+      ;;
    \?)
      echo "Invalid option: -$OPTARG" >&2
-      echo "Usage: $0 [-t] [-p]"
+      echo "Usage: $0 [-t] [-p] [-b branch]"
      exit 1
      ;;
  esac
@@ -29,24 +33,72 @@ docker build -t canvas_management:$VERSION .

 if [ "$TAG_FLAG" = true ]; then
  echo "Tagging images..."
-  echo "alexmickelson/canvas_management:$VERSION"
-  echo "alexmickelson/canvas_management:$MAJOR_VERSION"
-  echo "alexmickelson/canvas_management:latest"
  
-  docker image tag canvas_management:"$VERSION" alexmickelson/canvas_management:"$VERSION"
-  docker image tag canvas_management:"$VERSION" alexmickelson/canvas_management:"$MAJOR_VERSION"
-  docker image tag canvas_management:latest alexmickelson/canvas_management:latest
+  if [ -n "$BRANCH" ]; then
+    # Branch-specific tags
+    echo "alexmickelson/canvas_management:$VERSION-$BRANCH"
+    echo "alexmickelson/canvas_management:$MAJOR_VERSION-$BRANCH"
+    echo "alexmickelson/canvas_management:latest-$BRANCH"
+    
+    docker image tag canvas_management:"$VERSION" alexmickelson/canvas_management:"$VERSION-$BRANCH"
+    docker image tag canvas_management:"$VERSION" alexmickelson/canvas_management:"$MAJOR_VERSION-$BRANCH"
+    docker image tag canvas_management:"$VERSION" alexmickelson/canvas_management:latest-$BRANCH
+    
+    # Only create non-branch tags if branch is "main"
+    if [ "$BRANCH" = "main" ]; then
+      echo "alexmickelson/canvas_management:$VERSION"
+      echo "alexmickelson/canvas_management:$MAJOR_VERSION"
+      echo "alexmickelson/canvas_management:latest"
+      
+      docker image tag canvas_management:"$VERSION" alexmickelson/canvas_management:"$VERSION"
+      docker image tag canvas_management:"$VERSION" alexmickelson/canvas_management:"$MAJOR_VERSION"
+      docker image tag canvas_management:"$VERSION" alexmickelson/canvas_management:latest
+    fi
+  else
+    # No branch specified - create standard tags (for local development)
+    echo "alexmickelson/canvas_management:$VERSION"
+    echo "alexmickelson/canvas_management:$MAJOR_VERSION"
+    echo "alexmickelson/canvas_management:latest"
+    
+    docker image tag canvas_management:"$VERSION" alexmickelson/canvas_management:"$VERSION"
+    docker image tag canvas_management:"$VERSION" alexmickelson/canvas_management:"$MAJOR_VERSION"
+    docker image tag canvas_management:"$VERSION" alexmickelson/canvas_management:latest
+  fi
 fi

 if [ "$PUSH_FLAG" = true ]; then
  echo "Pushing images..."
-  echo "alexmickelson/canvas_management:$VERSION"
-  echo "alexmickelson/canvas_management:$MAJOR_VERSION"
-  echo "alexmickelson/canvas_management:latest"
  
-  docker push alexmickelson/canvas_management:"$VERSION"
-  docker push alexmickelson/canvas_management:"$MAJOR_VERSION"
-  docker push alexmickelson/canvas_management:latest
+  if [ -n "$BRANCH" ]; then
+    # Push branch-specific tags
+    echo "alexmickelson/canvas_management:$VERSION-$BRANCH"
+    echo "alexmickelson/canvas_management:$MAJOR_VERSION-$BRANCH"
+    echo "alexmickelson/canvas_management:latest-$BRANCH"
+    
+    docker push alexmickelson/canvas_management:"$VERSION-$BRANCH"
+    docker push alexmickelson/canvas_management:"$MAJOR_VERSION-$BRANCH"
+    docker push alexmickelson/canvas_management:latest-$BRANCH
+    
+    # Only push non-branch tags if branch is "main"
+    if [ "$BRANCH" = "main" ]; then
+      echo "alexmickelson/canvas_management:$VERSION"
+      echo "alexmickelson/canvas_management:$MAJOR_VERSION"
+      echo "alexmickelson/canvas_management:latest"
+      
+      docker push alexmickelson/canvas_management:"$VERSION"
+      docker push alexmickelson/canvas_management:"$MAJOR_VERSION"
+      docker push alexmickelson/canvas_management:latest
+    fi
+  else
+    # No branch specified - push standard tags (for local development)
+    echo "alexmickelson/canvas_management:$VERSION"
+    echo "alexmickelson/canvas_management:$MAJOR_VERSION"
+    echo "alexmickelson/canvas_management:latest"
+    
+    docker push alexmickelson/canvas_management:"$VERSION"
+    docker push alexmickelson/canvas_management:"$MAJOR_VERSION"
+    docker push alexmickelson/canvas_management:latest
+  fi
 fi

 if [ "$TAG_FLAG" = false ] && [ "$PUSH_FLAG" = false ]; then
@@ -54,12 +106,33 @@ if [ "$TAG_FLAG" = false ] && [ "$PUSH_FLAG" = false ]; then
  echo "Build complete."
  echo "To tag, run with -t flag."
  echo "To push, run with -p flag."
+  echo "To build for a specific branch, use -b branch_name flag."
  echo "Or manually run:"
  echo ""
-  echo "docker image tag canvas_management:$VERSION alexmickelson/canvas_management:$VERSION"
-  echo "docker image tag canvas_management:$VERSION alexmickelson/canvas_management:$MAJOR_VERSION"
-  echo "docker image tag canvas_management:latest alexmickelson/canvas_management:latest"
-  echo "docker push alexmickelson/canvas_management:$VERSION"
-  echo "docker push alexmickelson/canvas_management:$MAJOR_VERSION"
-  echo "docker push alexmickelson/canvas_management:latest"
+  if [ -n "$BRANCH" ]; then
+    echo "# Branch-specific tags:"
+    echo "docker image tag canvas_management:$VERSION alexmickelson/canvas_management:$VERSION-$BRANCH"
+    echo "docker image tag canvas_management:$VERSION alexmickelson/canvas_management:$MAJOR_VERSION-$BRANCH"
+    echo "docker image tag canvas_management:$VERSION alexmickelson/canvas_management:latest-$BRANCH"
+    echo "docker push alexmickelson/canvas_management:$VERSION-$BRANCH"
+    echo "docker push alexmickelson/canvas_management:$MAJOR_VERSION-$BRANCH"
+    echo "docker push alexmickelson/canvas_management:latest-$BRANCH"
+    if [ "$BRANCH" = "main" ]; then
+      echo ""
+      echo "# Main branch also gets standard tags:"
+      echo "docker image tag canvas_management:$VERSION alexmickelson/canvas_management:$VERSION"
+      echo "docker image tag canvas_management:$VERSION alexmickelson/canvas_management:$MAJOR_VERSION"
+      echo "docker image tag canvas_management:$VERSION alexmickelson/canvas_management:latest"
+      echo "docker push alexmickelson/canvas_management:$VERSION"
+      echo "docker push alexmickelson/canvas_management:$MAJOR_VERSION"
+      echo "docker push alexmickelson/canvas_management:latest"
+    fi
+  else
+    echo "docker image tag canvas_management:$VERSION alexmickelson/canvas_management:$VERSION"
+    echo "docker image tag canvas_management:$VERSION alexmickelson/canvas_management:$MAJOR_VERSION"
+    echo "docker image tag canvas_management:$VERSION alexmickelson/canvas_management:latest"
+    echo "docker push alexmickelson/canvas_management:$VERSION"
+    echo "docker push alexmickelson/canvas_management:$MAJOR_VERSION"
+    echo "docker push alexmickelson/canvas_management:latest"
+  fi
 fi
--- a/globalSettings.yml
+++ b/globalSettings.yml
@@ -19,3 +19,5 @@ courses:
    name: Jonathan UX
  - path: ./1400/2025_spring_alex/modules/
    name: 1400-spring
+  - path: ./1420/2024-fall/Modules/
+    name: 1420_old
--- a/src/app/course/[courseName]/modules/[moduleName]/assignment/[assignmentName]/getAssignmentHelpString.tsx
+++ b/src/app/course/[courseName]/modules/[moduleName]/assignment/[assignmentName]/getAssignmentHelpString.tsx
@@ -55,6 +55,22 @@ flowchart TD
    C -->|Three| F[fa:fa-car Car]
 \`\`\`

+## LaTeX Math
+
+**Inline math:** The Fibonacci sequence is defined as: \$F(n) = F(n-1) + F(n-2)\$ where \$F(0) = 0\$ and \$F(1) = 1\$.
+
+**Block math:**
+\$\$F(n) = F(n-1) + F(n-2)\$\$
+
+**Complex equations:**
+\$\$
+F(n) = \\begin{cases} 
+0 & \\text{if } n = 0 \\\\
+1 & \\text{if } n = 1 \\\\
+F(n-1) + F(n-2) & \\text{if } n > 1
+\\end{cases}
+\$\$
+
 ## github classroom links will be replaced by the GithubClassroomAssignmentShareLink setting

 [Github Classroom](insert_github_classroom_url)
--- a/src/app/course/[courseName]/settings/AssignmentGroupManagement.tsx
+++ b/src/app/course/[courseName]/settings/AssignmentGroupManagement.tsx
@@ -12,11 +12,13 @@ import { Spinner } from "@/components/Spinner";
 import MeatballIcon from "./MeatballIcon";
 import { useSetAssignmentGroupsMutation } from "@/features/canvas/hooks/canvasCourseHooks";
 import { baseCanvasUrl } from "@/features/canvas/services/canvasServiceUtils";
+import Modal, { useModal } from "@/components/Modal";

 export default function AssignmentGroupManagement() {
  const { data: settings, isPending } = useLocalCourseSettingsQuery();
  const updateSettings = useUpdateLocalCourseSettingsMutation();
  const applyInCanvas = useSetAssignmentGroupsMutation(settings.canvasId);
+  const modal = useModal();

  const [assignmentGroups, setAssignmentGroups] = useState<
    LocalAssignmentGroup[]
@@ -104,17 +106,46 @@ export default function AssignmentGroupManagement() {
      </div>
      <br />
      <div className="flex justify-end">
-        <button
-          onClick={async () => {
-            const newSettings = await applyInCanvas.mutateAsync(settings);
-
-            // prevent debounce from resetting
-            if (newSettings) setAssignmentGroups(newSettings.assignmentGroups);
-          }}
-          disabled={applyInCanvas.isPending}
+        <Modal
+          modalControl={modal}
+          buttonText="Update Assignment Groups In Canvas"
+          buttonClass="btn-"
+          modalWidth="w-1/5"
        >
-          Update Assignment Groups In Canvas
-        </button>
+          {({ closeModal }) => (
+            <div>
+              <div className="text-center font-bold">
+                DANGER: updating assignment groups can delete assignments and grades from canvas.
+              </div>
+              <div className="text-center">
+                This is only recommended to do at the beginning of a semester. Are you sure you want to continue?
+              </div>
+              <br />
+              <div className="flex justify-around gap-3">
+                <button
+                  onClick={async () => {
+                    const newSettings = await applyInCanvas.mutateAsync(
+                      settings
+                    );
+
+                    // prevent debounce from resetting
+                    if (newSettings)
+                      setAssignmentGroups(newSettings.assignmentGroups);
+                  }}
+                  disabled={applyInCanvas.isPending}
+                  className="btn-danger"
+                >
+                  Yes
+                </button>
+                <button onClick={closeModal} disabled={applyInCanvas.isPending}>
+                  No
+                </button>
+              </div>
+              {applyInCanvas.isPending && <Spinner />}
+            </div>
+          )}
+        </Modal>
+      
      </div>
      {applyInCanvas.isPending && <Spinner />}
      {applyInCanvas.isSuccess && (
Author	SHA1	Message	Date
copilot-swe-agent[bot]	2a350f5629	Implement branch-specific docker tags in build script and CI workflow Co-authored-by: alexmickelson <43245625+alexmickelson@users.noreply.github.com>	2025-09-29 18:01:33 +00:00
copilot-swe-agent[bot]	c29c7c0853	Initial plan	2025-09-29 17:44:13 +00:00
Alex Mickelson	33120c40a5	simplify build process	2025-09-22 10:53:25 -06:00
Alex Mickelson	2ec3d9349e	merge	2025-09-22 10:51:13 -06:00
Alex Mickelson	5e088fb4eb	Merge pull request #13 from alexmickelson/copilot/fix-12 Add GitHub Actions workflow for automated Docker Hub deployment	2025-09-22 10:48:19 -06:00
Alex Mickelson	58175c1426	Merge branch 'main' of github.com:alexmickelson/canvasManagement	2025-09-16 14:11:52 -06:00
Alex Mickelson	03529f875a	latex in help string	2025-09-16 14:11:51 -06:00