Feat/update to 24.04 (#21)

* Update build.yml to use native runner * Update C image to 24.04 * Update Rust image to 24.04 * Add build on PR * Update build.yml to use versioned build-and-push-docker-image workflow * Disable swift * Remove date tag --------- Co-authored-by: Robert Jandow <[email protected]>
ls1intum · Jan 24, 2025 · 1047194 · 1047194
1 parent 4215ddb
commit 1047194
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 21 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,17 +1,20 @@
 on:
+  pull_request:
+    branches:
+      - master
   push:
     branches:
       - master
   workflow_dispatch:
 
 jobs:
   build-and-push-base:
-    uses: ls1intum/.github/.github/workflows/build-and-push-docker-image.yml@feat/docker-run-network
+    uses: ls1intum/.github/.github/workflows/build-and-push-docker-image.yml@v1.0.0
     with:
       docker-file: images/base-ide/BaseDockerfile
       image-name: ghcr.io/ls1intum/theia/base
       docker-context: .
-      tags: "2024-11-11"
+      tags: "2025-01-24"
       network: "host"
     secrets: inherit
 
@@ -24,46 +27,37 @@ jobs:
           - docker-file: images/c/ToolDockerfile
             docker-context: '.'
             image-name: ghcr.io/ls1intum/theia/c
-            tags: "2024-11-11"
           - docker-file: images/haskell/ToolDockerfile
             docker-context: '.'
             image-name: ghcr.io/ls1intum/theia/haskell
-            tags: "2024-11-11"
           - docker-file: images/java-17/ToolDockerfile
             docker-context: '.'
             image-name: ghcr.io/ls1intum/theia/java-17
-            tags: "2024-11-11"
           - docker-file: images/javascript/ToolDockerfile
             docker-context: '.'
             image-name: ghcr.io/ls1intum/theia/javascript
-            tags: "2024-11-11"
           - docker-file: images/ocaml/ToolDockerfile
             docker-context: '.'
             image-name: ghcr.io/ls1intum/theia/ocaml
-            tags: "2024-11-11"
           - docker-file: images/python/ToolDockerfile
             docker-context: '.'
             image-name: ghcr.io/ls1intum/theia/python
-            tags: "2024-11-11"
           - docker-file: images/rust/ToolDockerfile
             docker-context: '.'
             image-name: ghcr.io/ls1intum/theia/rust
-            tags: "2024-11-11"
-          - docker-file: images/swift/ToolDockerfile
-            docker-context: '.'
-            image-name: ghcr.io/ls1intum/theia/swift
-            build-args: |
-              "BUILDER_IMAGE=swift:5.9.2-focal"
-              "RUNTIME_IMAGE=swift:5.9.2-focal"
-              "SWIFTLINT_VERSION=0.54.0"
-            tags: "2024-11-11"
+          # - docker-file: images/swift/ToolDockerfile
+          #   docker-context: '.'
+          #   image-name: ghcr.io/ls1intum/theia/swift
+          #   build-args: |
+          #     "BUILDER_IMAGE=swift:5.9.2-focal"
+          #     "RUNTIME_IMAGE=swift:5.9.2-focal"
+          #     "SWIFTLINT_VERSION=0.54.0"
 
-    uses: ls1intum/.github/.github/workflows/build-and-push-docker-image.yml@feat/docker-run-network
+    uses: ls1intum/.github/.github/workflows/build-and-push-docker-image.yml@v1.0.0
     with:
       docker-file: ${{ matrix.docker-file }}
       image-name: ${{ matrix.image-name }}
       docker-context: ${{ matrix.docker-context }}
-      tags: ${{ matrix.tags }}
       network: "host"
     secrets: inherit
 

diff --git a/images/c/ToolDockerfile b/images/c/ToolDockerfile
@@ -24,7 +24,7 @@ RUN yarn --pure-lockfile --network-timeout 1000000 && \
 # Assemble the application
 # Adapted from https://github.com/ls1intum/artemis-c-docker/blob/main/Dockerfile
 # Changed: Use theia user instead of artemis user, do not install python
-FROM ubuntu:23.04 as final-ide
+FROM ubuntu:24.04 as final-ide
 
 # Make sure all sources are up to date
 RUN apt update && \

diff --git a/images/rust/ToolDockerfile b/images/rust/ToolDockerfile
@@ -22,7 +22,7 @@ RUN yarn --pure-lockfile --network-timeout 1000000 && \
     yarn download:plugins
 
 # Assemble the application
-FROM ubuntu:23.04 as final-ide
+FROM ubuntu:24.04 as final-ide
 
 # Make sure all sources are up to date
 RUN apt update && \