[Refactor:Developer] Refactor Repo (#39)

This PR refactor's the whole repo to use the new github action for building and pushing Docker images. This adds a new CI test to only build the changed dockerfiles for PRs to this repo. This is done in this PR to test the building for current dockerfiles before merging. Closes Submitty/Submitty#10461.
Submitty · Jul 16, 2024 · 2a44936 · 2a44936
1 parent 79d9dd6
commit 2a44936
Show file tree

Hide file tree

Showing 33 changed files with 57 additions and 295 deletions.
diff --git a/.github/workflows/docker-build-pr.yml b/.github/workflows/docker-build-pr.yml
@@ -0,0 +1,15 @@
+name: Docker Build and Push
+
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  call-docker-build-push:
+    uses: submitty/action-docker-build/.github/workflows/[email protected]
+    with:
+      push: false
+      docker_org_name: ${{ vars.docker_org_name }}
+      base_commit: ${{ github.event.pull_request.base.sha }}
+      head_commit: ${{ github.event.pull_request.head.sha }}
diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml
@@ -6,97 +6,13 @@ on:
       - "main"
 
 jobs:
-  generate-matrix:
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-      run_docker_jobs: ${{ steps.set-run-docker-jobs.outputs.run_docker_jobs }}
-      run_latest_docker_jobs: ${{ steps.set-run-docker-jobs.outputs.run_latest_docker_jobs }}
-      latest-matrix: ${{ steps.set-matrix.outputs.latest-matrix }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: ${{ github.event_name == 'pull_request' && 2 || 0 }}
-      - name: Get changed files
-        id: changed-files
-        run: |
-          echo "changed_files=$(git diff --name-only ${{ github.event.before }} ${{ github.event.after }} | xargs)" >> $GITHUB_OUTPUT
-      - name: Count number of files changed
-        id: set-run-docker-jobs
-        run: |
-          number_of_changed_files=$(git diff --name-only ${{ github.event.before }} ${{ github.event.after }} | grep -E '^.*\/submitty\/[^/]+\/[^/]+\/Dockerfile$' | wc -l)
-          echo $number_of_changed_files
-          if [[ "$number_of_changed_files" -gt 0 ]]; then
-            echo "run_docker_jobs=true" >> $GITHUB_OUTPUT
-          else
-            echo "run_docker_jobs=false" >> $GITHUB_OUTPUT
-          fi
-
-          number_of_changed_latest_files=$(bash ./bin/check_docker_latest_run.sh ${{ github.event.before }} ${{ github.event.after }} | xargs )
-          echo $number_of_changed_latest_files
-          if [[ "$number_of_changed_latest_files" -gt 0 ]]; then
-            echo "run_latest_docker_jobs=true" >> $GITHUB_OUTPUT
-          else
-            echo "run_latest_docker_jobs=false" >> $GITHUB_OUTPUT
-          fi
-      - name: List changed files
-        run: |
-          for file in ${{ steps.changed-files.outputs.changed_files }}; do
-              echo "$file was changed"
-          done
-      - name: Set Matrix
-        id: set-matrix
-        run: |
-          echo "matrix=$(bash ./bin/generate_matrix.sh ${{ github.event.before }} ${{ github.event.after }} | xargs )" >> $GITHUB_OUTPUT
-          echo "latest-matrix=$(bash ./bin/generate_latest_matrix.sh ${{ github.event.before }} ${{ github.event.after }} | xargs )" >> $GITHUB_OUTPUT
-      - name: List Matrix
-        run: |
-          echo ${{ steps.set-matrix.outputs.matrix }}
-          echo ${{ steps.set-run-docker-jobs.outputs.run_docker_jobs }}
-          echo ${{ steps.set-matrix.outputs.latest-matrix }}
-          echo ${{ steps.set-run-docker-jobs.outputs.run_latest_docker_jobs }}
-  docker:
-    needs:
-      - generate-matrix
-    if: needs.generate-matrix.outputs.run_docker_jobs == 'true'
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
-    steps:
-      - name: Check out repo
-        uses: actions/checkout@v3
-      - name: Docker Hub login
-        uses: docker/login-action@releases/v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME_SUBMITTY }}
-          password: ${{ secrets.DOCKER_PASSWORD_SUBMITTY }}
-      - name: Build and push docker
-        uses: docker/build-push-action@v4
-        with:
-          context: ${{ matrix.context }}
-          push: true
-          tags: submitty/${{ matrix.dockername }}:${{ matrix.tag }}
-  docker-latest:
-    needs:
-      - generate-matrix
-    if: needs.generate-matrix.outputs.run_latest_docker_jobs == 'true'
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix: ${{ fromJson(needs.generate-matrix.outputs.latest-matrix) }}
-    steps:
-      - name: Check out repo
-        uses: actions/checkout@v3
-      - name: Docker Hub login
-        uses: docker/login-action@releases/v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME_SUBMITTY }}
-          password: ${{ secrets.DOCKER_PASSWORD_SUBMITTY }}
-      - name: Build and push docker
-        uses: docker/build-push-action@v4
-        with:
-          context: ${{ matrix.context }}
-          push: true
-          tags: submitty/${{ matrix.dockername }}:latest
+  call-docker-build-push:
+    uses: submitty/action-docker-build/.github/workflows/[email protected]
+    with:
+      push: true
+      docker_org_name: ${{ vars.docker_org_name }}
+      base_commit: ${{ github.event.before }}
+      head_commit: ${{ github.event.after }}
+    secrets:
+      docker_username: ${{ secrets.docker_username }}
+      docker_password: ${{ secrets.docker_password }}
diff --git a/bin/check_docker_latest_run.sh b/bin/check_docker_latest_run.sh
diff --git a/bin/generate_latest_matrix.sh b/bin/generate_latest_matrix.sh
diff --git a/bin/generate_matrix.sh b/bin/generate_matrix.sh
diff --git a/dockerfiles/autograding-default/metadata.json b/dockerfiles/autograding-default/metadata.json
@@ -0,0 +1,4 @@
+{
+    "pushLatest": true,
+    "latestTag": "ubuntu-20.04"
+}
diff --git a/...s/submitty/autograding-default/Dockerfile → ...tograding-default/ubuntu-20.04/Dockerfile b/...s/submitty/autograding-default/Dockerfile → ...tograding-default/ubuntu-20.04/Dockerfile
@@ -23,6 +23,9 @@ ENV AnalysisTools_Version v22.03.00
 ENV AnalysisToolsTS_Version v23.06.01
 ENV SUBMITTY_INSTALL_DIR /usr/local/submitty
 
+
+
+
 RUN apt-get update \
     && apt-get install -y --no-install-recommends wget ca-certificates rsync \
     && mkdir -p ${SUBMITTY_INSTALL_DIR}/drmemory \

diff --git a/dockerfiles/submitty/clang/10/Dockerfile → dockerfiles/clang/10/Dockerfile b/dockerfiles/submitty/clang/10/Dockerfile → dockerfiles/clang/10/Dockerfile
diff --git a/dockerfiles/clang/metadata.json b/dockerfiles/clang/metadata.json
@@ -0,0 +1,4 @@
+{
+    "pushLatest": true,
+    "latestTag": "10"
+}
diff --git a/dockerfiles/submitty/java/11/Dockerfile → dockerfiles/java/11/Dockerfile b/dockerfiles/submitty/java/11/Dockerfile → dockerfiles/java/11/Dockerfile
@@ -11,7 +11,7 @@ RUN apt-get update && \
 RUN curl -L -o /adoptopenjdk.tar.gz https://github.com/AdoptOpenJDK/openjdk11-upstream-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_linux_11.0.12_7.tar.gz && \
     tar -xzf /adoptopenjdk.tar.gz -C /opt && \
     rm /adoptopenjdk.tar.gz && \
-    ln -s /opt/openjdk-11.0.12_7 /opt/openjdk11
+    ln -s /opt/jdk-11.0.12+7 /opt/openjdk11
 
 # Set environment variables
 ENV JAVA_HOME=/opt/openjdk11

diff --git a/dockerfiles/submitty/java/8/Dockerfile → dockerfiles/java/8/Dockerfile b/dockerfiles/submitty/java/8/Dockerfile → dockerfiles/java/8/Dockerfile
diff --git a/dockerfiles/java/metadata.json b/dockerfiles/java/metadata.json
@@ -0,0 +1,4 @@
+{
+    "pushLatest": true,
+    "latestTag": "11"
+}
diff --git a/dockerfiles/submitty/php/7.3-cli/Dockerfile → dockerfiles/php/7.3-cli/Dockerfile b/dockerfiles/submitty/php/7.3-cli/Dockerfile → dockerfiles/php/7.3-cli/Dockerfile
diff --git a/dockerfiles/php/metadata.json b/dockerfiles/php/metadata.json
@@ -0,0 +1,4 @@
+{
+    "pushLatest": true,
+    "latestTag": "7.3-cli"
+}
diff --git a/dockerfiles/submitty/python/3.7/Dockerfile → dockerfiles/python/3.7/Dockerfile b/dockerfiles/submitty/python/3.7/Dockerfile → dockerfiles/python/3.7/Dockerfile
diff --git a/dockerfiles/python/metadata.json b/dockerfiles/python/metadata.json
@@ -0,0 +1,4 @@
+{
+    "pushLatest": true,
+    "latestTag": "3.7"
+}
diff --git a/...erfiles/submitty/python/qiskit/Dockerfile → dockerfiles/python/qiskit/Dockerfile b/...erfiles/submitty/python/qiskit/Dockerfile → dockerfiles/python/qiskit/Dockerfile
diff --git a/...mitty/tutorial/database_client/Dockerfile → ...files/tutorial/database_client/Dockerfile b/...mitty/tutorial/database_client/Dockerfile → ...files/tutorial/database_client/Dockerfile
diff --git a/dockerfiles/tutorial/metadata.json b/dockerfiles/tutorial/metadata.json
@@ -0,0 +1,3 @@
+{
+    "pushLatest": false
+}
diff --git a/.../submitty/tutorial/tutorial_18/Dockerfile → dockerfiles/tutorial/tutorial_18/Dockerfile b/.../submitty/tutorial/tutorial_18/Dockerfile → dockerfiles/tutorial/tutorial_18/Dockerfile
diff --git a/...tty/tutorial/tutorial_18/contributors.sql → ...les/tutorial/tutorial_18/contributors.sql b/...tty/tutorial/tutorial_18/contributors.sql → ...les/tutorial/tutorial_18/contributors.sql
diff --git a/...ty/tutorial/tutorial_18/setup-contrib.sql → ...es/tutorial/tutorial_18/setup-contrib.sql b/...ty/tutorial/tutorial_18/setup-contrib.sql → ...es/tutorial/tutorial_18/setup-contrib.sql
diff --git a/...itty/tutorial/tutorial_18/setup-users.sql → ...iles/tutorial/tutorial_18/setup-users.sql b/...itty/tutorial/tutorial_18/setup-users.sql → ...iles/tutorial/tutorial_18/setup-users.sql
diff --git a/...s/submitty/tutorial/tutorial_18_test/0.sh → dockerfiles/tutorial/tutorial_18_test/0.sh b/...s/submitty/tutorial/tutorial_18_test/0.sh → dockerfiles/tutorial/tutorial_18_test/0.sh
diff --git a/...itty/tutorial/tutorial_18_test/Dockerfile → ...iles/tutorial/tutorial_18_test/Dockerfile b/...itty/tutorial/tutorial_18_test/Dockerfile → ...iles/tutorial/tutorial_18_test/Dockerfile
diff --git a/...utorial/tutorial_18_test/contributors.sql → ...utorial/tutorial_18_test/contributors.sql b/...utorial/tutorial_18_test/contributors.sql → ...utorial/tutorial_18_test/contributors.sql
diff --git a/...torial/tutorial_18_test/setup-contrib.sql → ...torial/tutorial_18_test/setup-contrib.sql b/...torial/tutorial_18_test/setup-contrib.sql → ...torial/tutorial_18_test/setup-contrib.sql
diff --git a/...tutorial/tutorial_18_test/setup-users.sql → ...tutorial/tutorial_18_test/setup-users.sql b/...tutorial/tutorial_18_test/setup-users.sql → ...tutorial/tutorial_18_test/setup-users.sql
diff --git a/dockerfiles/submitty/verilog/hello.v → dockerfiles/verilog/hello.v b/dockerfiles/submitty/verilog/hello.v → dockerfiles/verilog/hello.v
diff --git a/...rfiles/submitty/verilog/latest/Dockerfile → dockerfiles/verilog/latest/Dockerfile b/...rfiles/submitty/verilog/latest/Dockerfile → dockerfiles/verilog/latest/Dockerfile
@@ -9,7 +9,7 @@ RUN apt-get update \
       && rm -rf "/var/lib/apt/lists/*"
 
 RUN apt-get update \
-      && apt-get install -y iverilog gtkwave \
-      && rm -rf "/var/lib/apt/lists/*"
+    && apt-get install -y iverilog gtkwave \
+    && rm -rf "/var/lib/apt/lists/*"
 
 CMD ["/bin/bash"]
diff --git a/dockerfiles/verilog/metadata.json b/dockerfiles/verilog/metadata.json
@@ -0,0 +1,3 @@
+{
+    "pushLatest": false
+}
diff --git a/latest.json b/latest.json
diff --git a/test_images.py b/test_images.py