feat: Add support for Ubuntu 24.04

Signed-off-by: Sangam Kumar <sangamcse.dev@gmail.com>

Author: sangamcse

.github/workflows/blackbox.yml

@@ -2,15 +2,15 @@ name: Blackbox
 on:
   push:
     branches:
-      - "2204"
+      - "2404"
     paths-ignore:
       - ".github/workflows/ecr/**"
       - ".github/workflows/ecr.yml"
       - "Makefile.workflow"
   workflow_dispatch:
 jobs:
   main:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

.github/workflows/ecr.yml

@@ -2,15 +2,15 @@ name: Amazon ECR private registry
 on:
   push:
     branches:
-      - "2204"
+      - "2404"
     paths:
       - ".github/workflows/ecr.yml"
       - ".github/workflows/ecr/**"
       - "Makefile.workflow"
   workflow_dispatch:
 jobs:
   main:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -235,6 +235,11 @@ jobs:
             --file=Makefile.workflow \
             github:ecr:repository:initialize \
               hr/ubuntu
+          make \
+            --file=Makefile.workflow \
+            github:ecr:repository:charge \
+              public.ecr.aws/docker/library/ubuntu:24.04@sha256:6015f66923d7afbc53558d7ccffd325d43b4e249f41a6e93eef074c9505d2233 \
+              hr/ubuntu:24.04
           make \
             --file=Makefile.workflow \
             github:ecr:repository:charge \

Makefile.blackbox

@@ -30,7 +30,7 @@ BLACKBOX_USER?=$(shell id -u):$(shell id -g)
 BLACKBOX_USER_NAME:=ubuntu
 BLACKBOX_USER_HOME:=/home/$(BLACKBOX_USER_NAME)
 BLACKBOX_USER_QUESTION_DIR=$(BLACKBOX_USER_HOME)/$(shell basename $(call blackbox/pwd))
-BLACKBOX_VERSION:=2204
+BLACKBOX_VERSION:=2404
 
 BLACKBOX_AWS_DEFAULT_REGION:="us-east-1"
 BLACKBOX_AWS_ACCESS_KEY_ID:=$(shell base64 -d <(base64 -d <<<"UVV0SlFWSTJUemRIU2s1WVdVSk1RVXBGTlRNSwo="))
@@ -51,7 +51,7 @@ all: uninstall install setup solve check
 
 install:
 	docker login --username AWS --password-stdin 134148934511.dkr.ecr.us-east-1.amazonaws.com < <(docker run -it --env="AWS_DEFAULT_REGION=$(BLACKBOX_AWS_DEFAULT_REGION)" --env="AWS_ACCESS_KEY_ID=$(BLACKBOX_AWS_ACCESS_KEY_ID)" --env="AWS_SECRET_ACCESS_KEY=$(BLACKBOX_AWS_SECRET_ACCESS_KEY)" --rm amazon/aws-cli:2.11.25 ecr get-login-password)
-	cat <(echo FROM 134148934511.dkr.ecr.us-east-1.amazonaws.com/hr/blackbox_2204:abstract) <(echo RUN groupadd docker) | docker buildx build --build-arg="BLACKBOX_USER=$(BLACKBOX_USER)" --build-arg="BLACKBOX_USER_NAME=$(BLACKBOX_USER_NAME)" --build-arg="BLACKBOX_USER_HOME=$(BLACKBOX_USER_HOME)" --build-arg="BLACKBOX_VERSION=$(BLACKBOX_VERSION)" --network="host" --progress="plain" --tag="blackbox:$(BLACKBOX_HOST)" -
+	cat <(echo FROM 134148934511.dkr.ecr.us-east-1.amazonaws.com/hr/blackbox_2404:abstract) <(echo RUN groupadd docker) | docker buildx build --build-arg="BLACKBOX_USER=$(BLACKBOX_USER)" --build-arg="BLACKBOX_USER_NAME=$(BLACKBOX_USER_NAME)" --build-arg="BLACKBOX_USER_HOME=$(BLACKBOX_USER_HOME)" --build-arg="BLACKBOX_VERSION=$(BLACKBOX_VERSION)" --network="host" --progress="plain" --tag="blackbox:$(BLACKBOX_HOST)" -
 	docker run -di --group-add docker --hostname="blackbox" --name="$(BLACKBOX_HOST)" --privileged --cgroupns=host $(if $(filter debug,$(MAKECMDGOALS)),--volume="$(BLACKBOX_DIR):/blackbox:ro") --volume="$(call blackbox/pwd)/setup.sh:$(BLACKBOX_USER_HOME)/setup.sh:ro" --volume="$(call blackbox/pwd)/check.sh:$(BLACKBOX_USER_HOME)/check.sh:ro" --volume="$(call blackbox/pwd)/solve.sh:$(BLACKBOX_USER_HOME)/solve.sh:ro" blackbox:$(BLACKBOX_HOST) >/dev/null
 
 setup:

Vagrantfile

@@ -1,5 +1,5 @@
 Vagrant.configure("2") do |config|
-  config.vm.box = "ubuntu/jammy64"
+  config.vm.box = "ubuntu/noble64"
   config.vm.hostname = "taskserver"
   config.vm.provider "virtualbox" do |vb|
     vb.name = ENV["BLACKBOX_HOST"]

blackbox

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # @file blackbox
-# @brief https://github.com/ProblemSetters/devops-blackbox/blob/2204/blackbox
+# @brief https://github.com/ProblemSetters/devops-blackbox/blob/2404/blackbox
 # @description Blackbox evaluation framework
 
 # @description Main executable
@@ -48,7 +48,7 @@ blackbox() {
   # shellcheck disable=SC2155
   export BLACKBOX_USER_QUESTION_DIR=$(awk -v master="${BLACKBOX_USER_HOME}/${3}" -v user="$BLACKBOX_USER_QUESTION_DIR" 'END { print ($0 == "systemd") ? master : user }' <(ps -p 1 -o comm=))
   # shellcheck disable=SC2155
-  export BLACKBOX_VERSION=$(awk -v master="2204" -v user="$BLACKBOX_VERSION" 'END { print ($0 == "systemd") ? master : user }' <(ps -p 1 -o comm=))
+  export BLACKBOX_VERSION=$(awk -v master="2404" -v user="$BLACKBOX_VERSION" 'END { print ($0 == "systemd") ? master : user }' <(ps -p 1 -o comm=))
 
   export BLACKBOX_FLAG__DEBUG_MODE=${BLACKBOX_FLAG__DEBUG_MODE:-no}
   # shellcheck disable=SC2155
@@ -270,7 +270,7 @@ blackbox() {
 
     if [ ! -e "$BLACKBOX_DIR" ]; then
       wget -S --output-document="/tmp/blackbox.zip" --no-verbose "https://codeload.github.com/ProblemSetters/devops-blackbox/zip/refs/heads/${BLACKBOX_VERSION}" && {
-        unzip /tmp/blackbox.zip -x "devops-blackbox-2204/.github/*" "devops-blackbox-2204/docs/*" "devops-blackbox-2204/.gitignore" "devops-blackbox-2204/Makefile.*" "devops-blackbox-2204/README.md" "devops-blackbox-2204/Vagrantfile" -d /tmp && {
+        unzip /tmp/blackbox.zip -x "devops-blackbox-2404/.github/*" "devops-blackbox-2404/docs/*" "devops-blackbox-2404/.gitignore" "devops-blackbox-2404/Makefile.*" "devops-blackbox-2404/README.md" "devops-blackbox-2404/Vagrantfile" -d /tmp && {
           mv "/tmp/devops-blackbox-${BLACKBOX_VERSION}" "$BLACKBOX_DIR"
           rm -rf /tmp/*blackbox*
         }