From 91f3b60de8564ccf2e5667ef89b9f72d9fe41efe Mon Sep 17 00:00:00 2001
From: Pushyami Gundala <pushyami@umich.edu>
Date: Fri, 8 Nov 2024 11:38:40 -0500
Subject: [PATCH 01/11] #322 adding support Docker build from GH

---
 .github/workflows/cae.yml | 67 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 .github/workflows/cae.yml

diff --git a/.github/workflows/cae.yml b/.github/workflows/cae.yml
new file mode 100644
index 0000000..473a68f
--- /dev/null
+++ b/.github/workflows/cae.yml
@@ -0,0 +1,67 @@
+name: CAE Build/Release
+
+on:
+  push:
+    # takes muliple branch names
+    branches: 
+      - main
+      - '[0-9][0-9][0-9][0-9].[0-9][0-9].*' # 2021.01.x
+      - 'i322_gh_actions'
+    tags:
+      - '[0-9][0-9][0-9][0-9].[0-9][0-9].[0-9][0-9]' # 2021.01.01
+ 
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version'
+        required: true
+        default: 'YYYY.MINOR.MICRO'
+env:
+  REPO_URL: ${{ github.repository }}
+    
+jobs:
+  build:
+    # to test a feature, change the repo name to your github id
+    if: github.repository_owner == 'pushyamig' || github.event_name == 'workflow_dispatch'
+    runs-on: ubuntu-latest
+    steps:
+  
+      - name: Checkout code 
+        uses: actions/checkout@v4
+    
+      - name: Extract branch name
+        id: extract_branch
+        run: echo "BRANCH_NAME=$(basename ${{ github.ref }})" >> $GITHUB_ENV
+      
+      - name: build Docker image
+        run: |
+          docker build . --tag ghcr.io/${{ env.REPO_URL }}:${BRANCH_NAME}
+      
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+            registry: ghcr.io
+            username: ${{ github.actor }}
+            password: ${{ secrets.GITHUB_TOKEN }}
+      
+      - name: Push Docker image to GitHub Container Registry
+        run: |
+          docker push ghcr.io/${{ env.REPO_URL }}:${BRANCH_NAME}
+    
+  release: 
+     # Making sure that release only runs for tag pushes
+    if: startsWith(github.ref, 'refs/tags/') && github.repository_owner == 'pushyamig'
+    needs: build # This ensures the build job finishes successfully before starting this job
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Draft Release
+        id: create_release
+        uses: softprops/action-gh-release@v2
+        with:
+          draft: true
+          prerelease: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}    
+      
\ No newline at end of file

From c62012ac710c4f0bf760cb7475b86e20fb463ddb Mon Sep 17 00:00:00 2001
From: Pushyami Gundala <pushyami@umich.edu>
Date: Fri, 8 Nov 2024 11:46:00 -0500
Subject: [PATCH 02/11] Fixing the GH actions error

---
 .github/workflows/cae.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cae.yml b/.github/workflows/cae.yml
index 473a68f..062f769 100644
--- a/.github/workflows/cae.yml
+++ b/.github/workflows/cae.yml
@@ -35,7 +35,7 @@ jobs:
       
       - name: build Docker image
         run: |
-          docker build . --tag ghcr.io/${{ env.REPO_URL }}:${BRANCH_NAME}
+          docker build -f dockerfiles/Dockerfile . --tag ghcr.io/${{ env.REPO_URL }}:${BRANCH_NAME}
       
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -63,5 +63,4 @@ jobs:
           draft: true
           prerelease: true
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}    
-      
\ No newline at end of file
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 660532fad0e3d0f02d4e99c56fe5d65292cb7521 Mon Sep 17 00:00:00 2001
From: Pushyami Gundala <pushyami@umich.edu>
Date: Fri, 8 Nov 2024 11:52:36 -0500
Subject: [PATCH 03/11] Changing the build to dockerfile.openshift

---
 .github/workflows/cae.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cae.yml b/.github/workflows/cae.yml
index 062f769..cab83f3 100644
--- a/.github/workflows/cae.yml
+++ b/.github/workflows/cae.yml
@@ -35,7 +35,7 @@ jobs:
       
       - name: build Docker image
         run: |
-          docker build -f dockerfiles/Dockerfile . --tag ghcr.io/${{ env.REPO_URL }}:${BRANCH_NAME}
+          docker build -f dockerfiles/Dockerfile.openshift . --tag ghcr.io/${{ env.REPO_URL }}:${BRANCH_NAME}
       
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3

From a0c0727117f6ae68f45856ada4ede490f9444ed5 Mon Sep 17 00:00:00 2001
From: Pushyami Gundala <pushyami@umich.edu>
Date: Fri, 8 Nov 2024 12:43:04 -0500
Subject: [PATCH 04/11] remove openshift workflow

---
 .github/workflows/cae.yml   |  2 +-
 dockerfiles/Dockerfile.prod | 48 +++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 dockerfiles/Dockerfile.prod

diff --git a/.github/workflows/cae.yml b/.github/workflows/cae.yml
index cab83f3..76f1c21 100644
--- a/.github/workflows/cae.yml
+++ b/.github/workflows/cae.yml
@@ -35,7 +35,7 @@ jobs:
       
       - name: build Docker image
         run: |
-          docker build -f dockerfiles/Dockerfile.openshift . --tag ghcr.io/${{ env.REPO_URL }}:${BRANCH_NAME}
+          docker build -f dockerfiles/Dockerfile.prod . --tag ghcr.io/${{ env.REPO_URL }}:${BRANCH_NAME}
       
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
diff --git a/dockerfiles/Dockerfile.prod b/dockerfiles/Dockerfile.prod
new file mode 100644
index 0000000..2935063
--- /dev/null
+++ b/dockerfiles/Dockerfile.prod
@@ -0,0 +1,48 @@
+# node-build stage
+
+FROM node:20-slim AS node-build
+WORKDIR /build/
+
+COPY frontend .
+RUN npm install
+
+RUN npm run build:frontend
+
+# main stage
+
+FROM python:3.10-slim-bookworm AS main
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    build-essential default-libmysqlclient-dev netcat vim-tiny jq python3-dev git supervisor curl && \
+    apt-get upgrade -y && \
+    apt-get clean -y && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+
+WORKDIR /code
+
+# Copy only what is needed into /code/
+COPY backend ./backend
+COPY templates ./templates
+COPY manage.py start_backend.sh ./
+
+COPY --from=node-build /build/bundles ./frontend/bundles 
+COPY --from=node-build /build/webpack-stats.json ./frontend/
+
+# Collect the static files in the backend
+RUN python manage.py collectstatic --verbosity 0
+
+# Sets the local timezone of the docker image
+ARG TZ
+ENV TZ ${TZ:-America/Detroit}
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+# EXPOSE port 5000 to allow communication to/from server
+EXPOSE 5000
+
+CMD ["/code/start_backend.sh"]
+
+# Done!

From e88c5fedd1bc8bc7afff44c35f2f2499182a72e7 Mon Sep 17 00:00:00 2001
From: Pushyami Gundala <pushyami@umich.edu>
Date: Fri, 8 Nov 2024 13:31:11 -0500
Subject: [PATCH 05/11] add netcat-openbsd to dockerfile

---
 dockerfiles/Dockerfile.openshift | 53 --------------------------------
 dockerfiles/Dockerfile.prod      |  2 +-
 2 files changed, 1 insertion(+), 54 deletions(-)
 delete mode 100644 dockerfiles/Dockerfile.openshift

diff --git a/dockerfiles/Dockerfile.openshift b/dockerfiles/Dockerfile.openshift
deleted file mode 100644
index dbaec16..0000000
--- a/dockerfiles/Dockerfile.openshift
+++ /dev/null
@@ -1,53 +0,0 @@
-# node-build stage
-
-FROM image-registry.openshift-image-registry.svc:5000/openshift/node:20-slim AS node-build
-WORKDIR /build/
-
-COPY frontend .
-RUN npm install
-
-RUN npm run build:frontend
-
-# main stage
-
-FROM image-registry.openshift-image-registry.svc:5000/openshift/python:3.10-slim AS main
-
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-    build-essential netcat-openbsd vim-tiny jq python3-dev git supervisor curl pkg-config && \
-    apt-get upgrade -y && \
-    apt-get clean -y && \
-    rm -rf /var/lib/apt/lists/*
-
-# Install MariaDB from the mariadb repository rather than using Debians 
-# https://mariadb.com/kb/en/mariadb-package-repository-setup-and-usage/
-RUN curl -LsS https://r.mariadb.com/downloads/mariadb_repo_setup | bash && \
-apt install -y --no-install-recommends libmariadb-dev
-
-COPY requirements.txt .
-RUN pip install --no-cache-dir -r requirements.txt
-
-WORKDIR /code
-
-# Copy only what is needed into /code/
-COPY backend ./backend
-COPY templates ./templates
-COPY manage.py start_backend.sh ./
-
-COPY --from=node-build /build/bundles ./frontend/bundles 
-COPY --from=node-build /build/webpack-stats.json ./frontend/
-
-# Collect the static files in the backend
-RUN python manage.py collectstatic --verbosity 0
-
-# Sets the local timezone of the docker image
-ARG TZ
-ENV TZ ${TZ:-America/Detroit}
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-# EXPOSE port 5000 to allow communication to/from server
-EXPOSE 5000
-
-CMD ["/code/start_backend.sh"]
-
-# Done!
diff --git a/dockerfiles/Dockerfile.prod b/dockerfiles/Dockerfile.prod
index 2935063..7da2fa5 100644
--- a/dockerfiles/Dockerfile.prod
+++ b/dockerfiles/Dockerfile.prod
@@ -14,7 +14,7 @@ FROM python:3.10-slim-bookworm AS main
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-    build-essential default-libmysqlclient-dev netcat vim-tiny jq python3-dev git supervisor curl && \
+    build-essential default-libmysqlclient-dev netcat-openbsd vim-tiny jq python3-dev git supervisor curl && \
     apt-get upgrade -y && \
     apt-get clean -y && \
     rm -rf /var/lib/apt/lists/*

From c40212f0d34531b7271feeebcc84ce26cbe07285 Mon Sep 17 00:00:00 2001
From: Pushyami Gundala <pushyami@umich.edu>
Date: Fri, 8 Nov 2024 13:40:47 -0500
Subject: [PATCH 06/11] Removing my repo referance

---
 .github/workflows/cae.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/cae.yml b/.github/workflows/cae.yml
index 76f1c21..8b82cca 100644
--- a/.github/workflows/cae.yml
+++ b/.github/workflows/cae.yml
@@ -6,7 +6,6 @@ on:
     branches: 
       - main
       - '[0-9][0-9][0-9][0-9].[0-9][0-9].*' # 2021.01.x
-      - 'i322_gh_actions'
     tags:
       - '[0-9][0-9][0-9][0-9].[0-9][0-9].[0-9][0-9]' # 2021.01.01
  
@@ -22,7 +21,7 @@ env:
 jobs:
   build:
     # to test a feature, change the repo name to your github id
-    if: github.repository_owner == 'pushyamig' || github.event_name == 'workflow_dispatch'
+    if: github.repository_owner == 'tl-its-umich-edu' || github.event_name == 'workflow_dispatch'
     runs-on: ubuntu-latest
     steps:
   
@@ -50,7 +49,7 @@ jobs:
     
   release: 
      # Making sure that release only runs for tag pushes
-    if: startsWith(github.ref, 'refs/tags/') && github.repository_owner == 'pushyamig'
+    if: startsWith(github.ref, 'refs/tags/') && github.repository_owner == 'tl-its-umich-edu'
     needs: build # This ensures the build job finishes successfully before starting this job
     runs-on: ubuntu-latest
     steps:
@@ -63,4 +62,4 @@ jobs:
           draft: true
           prerelease: true
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file

From d7314b4dbe016b96273dc7681e5f03b7750ff142 Mon Sep 17 00:00:00 2001
From: Pushyami Gundala <pushyami@umich.edu>
Date: Fri, 8 Nov 2024 15:53:19 -0500
Subject: [PATCH 07/11] Renaming CAE to IPT

---
 .github/workflows/{cae.yml => ipt.yml} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename .github/workflows/{cae.yml => ipt.yml} (98%)

diff --git a/.github/workflows/cae.yml b/.github/workflows/ipt.yml
similarity index 98%
rename from .github/workflows/cae.yml
rename to .github/workflows/ipt.yml
index 8b82cca..f504468 100644
--- a/.github/workflows/cae.yml
+++ b/.github/workflows/ipt.yml
@@ -1,4 +1,4 @@
-name: CAE Build/Release
+name: IPT Build/Release
 
 on:
   push:

From fa1622d5022367b7552a9185281d0bdbf6fc21bf Mon Sep 17 00:00:00 2001
From: Pushyami Gundala <pushyamig@users.noreply.github.com>
Date: Thu, 14 Nov 2024 09:16:48 -0500
Subject: [PATCH 08/11] Update .github/workflows/ipt.yml

Co-authored-by: Code Hugger (Matthew Jones) <jonespm@umich.edu>
---
 .github/workflows/ipt.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ipt.yml b/.github/workflows/ipt.yml
index f504468..0bee186 100644
--- a/.github/workflows/ipt.yml
+++ b/.github/workflows/ipt.yml
@@ -49,7 +49,7 @@ jobs:
     
   release: 
      # Making sure that release only runs for tag pushes
-    if: startsWith(github.ref, 'refs/tags/') && github.repository_owner == 'tl-its-umich-edu'
+    if: startsWith(github.ref, 'refs/tags/')'
     needs: build # This ensures the build job finishes successfully before starting this job
     runs-on: ubuntu-latest
     steps:

From 3d48627996225be5ed29a99d83168e1a111fb601 Mon Sep 17 00:00:00 2001
From: Pushyami Gundala <pushyami@umich.edu>
Date: Mon, 25 Nov 2024 15:30:56 -0500
Subject: [PATCH 09/11] having since Docker build for dev/prod

---
 .github/workflows/{ipt.yml => build_release.yml} | 2 +-
 deploy/supervisor_docker.conf                    | 2 +-
 docker-compose.yml                               | 1 +
 dockerfiles/Dockerfile                           | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)
 rename .github/workflows/{ipt.yml => build_release.yml} (98%)

diff --git a/.github/workflows/ipt.yml b/.github/workflows/build_release.yml
similarity index 98%
rename from .github/workflows/ipt.yml
rename to .github/workflows/build_release.yml
index 0bee186..605564d 100644
--- a/.github/workflows/ipt.yml
+++ b/.github/workflows/build_release.yml
@@ -1,4 +1,4 @@
-name: IPT Build/Release
+name: Build/Release
 
 on:
   push:
diff --git a/deploy/supervisor_docker.conf b/deploy/supervisor_docker.conf
index 2f1f0fe..5905501 100644
--- a/deploy/supervisor_docker.conf
+++ b/deploy/supervisor_docker.conf
@@ -12,7 +12,7 @@ startsecs=5
 startretries=2
 
 [program:frontend]
-command=npm run watch
+command=bash -c "if [ \"$RUN_FRONTEND\" = \"true\" ]; then npm run watch; else tail -f /dev/null; fi"
 directory=/code/frontend
 stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
diff --git a/docker-compose.yml b/docker-compose.yml
index 5aacffb..9f259d3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,6 +35,7 @@ services:
       - .env
     environment:
       - DEBUG=True
+      - RUN_FRONTEND=true
   redis:
     image: redis:7
     volumes:
diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile
index f5f1ad3..0d13ad8 100644
--- a/dockerfiles/Dockerfile
+++ b/dockerfiles/Dockerfile
@@ -40,6 +40,7 @@ WORKDIR /code
 # Sets the local timezone of the docker image
 ARG TZ
 ENV TZ ${TZ:-America/Detroit}
+ENV RUN_FRONTEND ${RUN_FRONTEND:-false}
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 # EXPOSE port 5000 to allow communication to/from server

From a5f997d63777d5a533696841a4bdcdb4ee5bb03c Mon Sep 17 00:00:00 2001
From: Pushyami Gundala <pushyami@umich.edu>
Date: Mon, 2 Dec 2024 10:22:53 -0500
Subject: [PATCH 10/11] Fixing the Build using GH

---
 .github/workflows/build_release.yml  | 20 ++++++------
 .gitignore                           |  2 ++
 dockerfiles/Dockerfile => Dockerfile | 35 +++++++++++++-------
 docker-compose-openshift-test.yml    | 36 ---------------------
 docker-compose.yml                   |  2 +-
 dockerfiles/Dockerfile.prod          | 48 ----------------------------
 6 files changed, 38 insertions(+), 105 deletions(-)
 rename dockerfiles/Dockerfile => Dockerfile (71%)
 delete mode 100644 docker-compose-openshift-test.yml
 delete mode 100644 dockerfiles/Dockerfile.prod

diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml
index 605564d..2b1554c 100644
--- a/.github/workflows/build_release.yml
+++ b/.github/workflows/build_release.yml
@@ -6,9 +6,11 @@ on:
     branches: 
       - main
       - '[0-9][0-9][0-9][0-9].[0-9][0-9].*' # 2021.01.x
+      - 'issue_322'
+      - 'i322_gh_actions'
     tags:
       - '[0-9][0-9][0-9][0-9].[0-9][0-9].[0-9][0-9]' # 2021.01.01
- 
+
   workflow_dispatch:
     inputs:
       version:
@@ -17,24 +19,24 @@ on:
         default: 'YYYY.MINOR.MICRO'
 env:
   REPO_URL: ${{ github.repository }}
-    
+
 jobs:
   build:
     # to test a feature, change the repo name to your github id
-    if: github.repository_owner == 'tl-its-umich-edu' || github.event_name == 'workflow_dispatch'
+    if: github.repository_owner == 'pushyamig' || github.event_name == 'workflow_dispatch'
     runs-on: ubuntu-latest
     steps:
-  
+
       - name: Checkout code 
         uses: actions/checkout@v4
-    
+
       - name: Extract branch name
         id: extract_branch
         run: echo "BRANCH_NAME=$(basename ${{ github.ref }})" >> $GITHUB_ENV
-      
+
       - name: build Docker image
         run: |
-          docker build -f dockerfiles/Dockerfile.prod . --tag ghcr.io/${{ env.REPO_URL }}:${BRANCH_NAME}
+          docker build -f Dockerfile . --tag ghcr.io/${{ env.REPO_URL }}:${BRANCH_NAME}
       
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -42,14 +44,14 @@ jobs:
             registry: ghcr.io
             username: ${{ github.actor }}
             password: ${{ secrets.GITHUB_TOKEN }}
-      
+
       - name: Push Docker image to GitHub Container Registry
         run: |
           docker push ghcr.io/${{ env.REPO_URL }}:${BRANCH_NAME}
     
   release: 
      # Making sure that release only runs for tag pushes
-    if: startsWith(github.ref, 'refs/tags/')'
+    if: startsWith(github.ref, 'refs/tags/')
     needs: build # This ensures the build job finishes successfully before starting this job
     runs-on: ubuntu-latest
     steps:
diff --git a/.gitignore b/.gitignore
index bf1cdaa..9286732 100644
--- a/.gitignore
+++ b/.gitignore
@@ -124,6 +124,7 @@ venv/
 ENV/
 env.bak/
 venv.bak/
+venv_*
 
 # Spyder project settings
 .spyderproject
@@ -261,6 +262,7 @@ dist
 
 # Stores VSCode versions used for testing VSCode extensions
 .vscode-test
+.history
 
 # yarn v2
 .yarn/cache
diff --git a/dockerfiles/Dockerfile b/Dockerfile
similarity index 71%
rename from dockerfiles/Dockerfile
rename to Dockerfile
index 0d13ad8..1bc049b 100644
--- a/dockerfiles/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,13 @@
-# FROM directive instructing base image to build upon
-# This could be used as a base instead: 
-# https://hub.docker.com/r/nikolaik/python-nodejs
+# node-build stage
+
+FROM node:20-slim AS node-build
+WORKDIR /build/
+
+COPY frontend .
+RUN npm install
+
+RUN npm run build:frontend
+
 FROM python:3.10-slim
 
 # NOTE: requirements.txt not likely to change between dev builds
@@ -27,20 +34,26 @@ apt install -y --no-install-recommends libmariadb-dev
 
 RUN pip install --no-cache-dir -r requirements.txt
 
-WORKDIR /code/frontend
-
 RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && \
-    apt install -y nodejs
-
-COPY /frontend/package*.json /code/frontend
-RUN npm install
+apt install -y nodejs
 
 WORKDIR /code
 
+# Copy only what is needed into /code/
+COPY backend ./backend
+COPY templates ./templates
+COPY manage.py start_backend.sh ./
+
+COPY --from=node-build /build/bundles ./frontend/bundles 
+COPY --from=node-build /build/webpack-stats.json ./frontend/
+COPY --from=node-build /build/node_modules ./frontend/node_modules
+
+
+
 # Sets the local timezone of the docker image
 ARG TZ
 ENV TZ ${TZ:-America/Detroit}
-ENV RUN_FRONTEND ${RUN_FRONTEND:-false}
+ENV RUN_FRONTEND ${RUN_FRONTEND:-false} 
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 # EXPOSE port 5000 to allow communication to/from server
@@ -50,4 +63,4 @@ EXPOSE 5000
 COPY . .
 
 CMD ["/usr/bin/supervisord", "-c", "/code/deploy/supervisor_docker.conf"]
-# done!
+# done!
\ No newline at end of file
diff --git a/docker-compose-openshift-test.yml b/docker-compose-openshift-test.yml
deleted file mode 100644
index cfa1ef8..0000000
--- a/docker-compose-openshift-test.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-version: "3.9"
-   
-services:
-
-  mysql:
-    image: mysql:5.7
-    restart: unless-stopped
-    command: ['--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci']
-    environment:
-      - MYSQL_ROOT_PASSWORD=cae_root_pw
-      - MYSQL_HOST=canvas_app_explorer_mysql
-      - MYSQL_PORT=3306
-      - MYSQL_DATABASE=canvas_app_explorer_local
-      - MYSQL_USER=cae_user
-      - MYSQL_PASSWORD=cae_pw
-    ports:
-      - "6306:3306"
-    volumes:
-      - ./.data/mysql:/var/lib/mysql:delegated
-    container_name: canvas_app_explorer_mysql
-  web:
-    build:
-      context: .
-      dockerfile: dockerfiles/Dockerfile.openshift
-      args:
-        - TZ=${TZ}
-    volumes:
-      # Only map the secrets for prod build
-      - ${HOME}/mylasecrets:/secrets
-    ports:
-      - "5000:5000"
-    container_name: canvas_app_explorer_prod
-    env_file:
-      - .env
-    environment:
-      - DEBUG=False
diff --git a/docker-compose.yml b/docker-compose.yml
index 9f259d3..25e1362 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,7 +19,7 @@ services:
   web:
     build:
       context: .
-      dockerfile: dockerfiles/Dockerfile
+      dockerfile: Dockerfile
       args:
         TZ: ${TZ}
     volumes:
diff --git a/dockerfiles/Dockerfile.prod b/dockerfiles/Dockerfile.prod
deleted file mode 100644
index 7da2fa5..0000000
--- a/dockerfiles/Dockerfile.prod
+++ /dev/null
@@ -1,48 +0,0 @@
-# node-build stage
-
-FROM node:20-slim AS node-build
-WORKDIR /build/
-
-COPY frontend .
-RUN npm install
-
-RUN npm run build:frontend
-
-# main stage
-
-FROM python:3.10-slim-bookworm AS main
-
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-    build-essential default-libmysqlclient-dev netcat-openbsd vim-tiny jq python3-dev git supervisor curl && \
-    apt-get upgrade -y && \
-    apt-get clean -y && \
-    rm -rf /var/lib/apt/lists/*
-
-COPY requirements.txt .
-RUN pip install --no-cache-dir -r requirements.txt
-
-WORKDIR /code
-
-# Copy only what is needed into /code/
-COPY backend ./backend
-COPY templates ./templates
-COPY manage.py start_backend.sh ./
-
-COPY --from=node-build /build/bundles ./frontend/bundles 
-COPY --from=node-build /build/webpack-stats.json ./frontend/
-
-# Collect the static files in the backend
-RUN python manage.py collectstatic --verbosity 0
-
-# Sets the local timezone of the docker image
-ARG TZ
-ENV TZ ${TZ:-America/Detroit}
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-# EXPOSE port 5000 to allow communication to/from server
-EXPOSE 5000
-
-CMD ["/code/start_backend.sh"]
-
-# Done!

From 32c8f76e6f40f6f1b01fadb71b0458ad6e78269b Mon Sep 17 00:00:00 2001
From: Pushyami Gundala <pushyami@umich.edu>
Date: Mon, 2 Dec 2024 10:28:20 -0500
Subject: [PATCH 11/11] remove my repo referance

---
 .github/workflows/build_release.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml
index 2b1554c..cf60048 100644
--- a/.github/workflows/build_release.yml
+++ b/.github/workflows/build_release.yml
@@ -6,8 +6,6 @@ on:
     branches: 
       - main
       - '[0-9][0-9][0-9][0-9].[0-9][0-9].*' # 2021.01.x
-      - 'issue_322'
-      - 'i322_gh_actions'
     tags:
       - '[0-9][0-9][0-9][0-9].[0-9][0-9].[0-9][0-9]' # 2021.01.01
 
@@ -23,7 +21,7 @@ env:
 jobs:
   build:
     # to test a feature, change the repo name to your github id
-    if: github.repository_owner == 'pushyamig' || github.event_name == 'workflow_dispatch'
+    if: github.repository_owner == 'tl-its-umich-edu' || github.event_name == 'workflow_dispatch'
     runs-on: ubuntu-latest
     steps: