Update rustup to 1.27, add ubuntu noble 24.04

devraymondsh · May 28, 2024 · d96ae24 · d96ae24
1 parent 27540ec
commit d96ae24
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 7 deletions.
diff --git a/.github/workflows/docker-lunar.yml b/.github/workflows/docker-lunar.yml
@@ -35,7 +35,7 @@ jobs:
           platforms: linux/amd64,linux/arm64,linux/armhf
           push: true
           file: dockerfiles/lunar/Dockerfile
-          tags: devraymondsh/ubuntu-rust:23.04,devraymondsh/ubuntu-rust:23.04-1.78,devraymondsh/ubuntu-rust:23.04-latest,devraymondsh/ubuntu-rust:lunar,devraymondsh/ubuntu-rust:lunar-1.78,devraymondsh/ubuntu-rust:lunar-latest,devraymondsh/ubuntu-rust:1.78,devraymondsh/ubuntu-rust:latest,devraymondsh/ubuntu-rust:latest-1.78
+          tags: devraymondsh/ubuntu-rust:23.04,devraymondsh/ubuntu-rust:23.04-1.78,devraymondsh/ubuntu-rust:23.04-latest,devraymondsh/ubuntu-rust:lunar,devraymondsh/ubuntu-rust:lunar-1.78,devraymondsh/ubuntu-rust:lunar-latest,devraymondsh/ubuntu-rust:1.78
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}

diff --git a/.github/workflows/docker-noble.yml b/.github/workflows/docker-noble.yml
@@ -0,0 +1,47 @@
+name: Build the 24.04 Docker image
+
+on:
+  push:
+    branches: [main]
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+
+      - name: Setup QEMU
+        id: qemu
+        uses: docker/setup-qemu-action@v2
+        with:
+          platforms: linux/amd64,linux/arm64,linux/armhf
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v3
+        with:
+          platforms: linux/amd64,linux/arm64,linux/armhf
+          push: true
+          file: dockerfiles/lunar/Dockerfile
+          tags: devraymondsh/ubuntu-rust:24.04,devraymondsh/ubuntu-rust:24.04-1.78,devraymondsh/ubuntu-rust:24.04-latest,devraymondsh/ubuntu-rust:lunar,devraymondsh/ubuntu-rust:lunar-1.78,devraymondsh/ubuntu-rust:lunar-latest,devraymondsh/ubuntu-rust:1.78,devraymondsh/ubuntu-rust:latest,devraymondsh/ubuntu-rust:latest-1.78
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
+      - name: Update dockerhub description
+        uses: peter-evans/dockerhub-description@v3
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+          repository: devraymondsh/ubuntu-rust
diff --git a/README.md b/README.md
@@ -2,7 +2,8 @@
 
 ## Supported tags:
 
-- 23.04, 23.04-1.78, lunar-1.78, lunar-latest, lunar, 23.04-latest, latest-1.78, 1.78, latest
+- 24.04, 24.04-1.78, noble-1.78, noble-latest, noble, 24.04-latest, latest-1.78, 1.78, latest
+- 23.04, 23.04-1.78, lunar-1.78, lunar-latest, lunar
 - 22.04, 22.04-1.78, jammy-1.78, jammy-latest, jammy
 - 20.04, 20.04-1.78, focal-1.78, focal-latest, focal
 

diff --git a/dockerfiles/noble/Dockerfile b/dockerfiles/noble/Dockerfile
@@ -0,0 +1,12 @@
+# syntax=docker/dockerfile:1
+FROM ubuntu:noble
+
+ENV CARGO_HOME=/usr/local/cargo
+ENV DEBIAN_FRONTEND=noninteractive
+ENV PATH=/usr/local/cargo/bin:$PATH
+ENV RUSTUP_HOME=/usr/local/rustup
+
+WORKDIR /.installer
+ADD ./install.sh ./install.sh
+RUN chmod +x ./install.sh && ./install.sh
+WORKDIR /
diff --git a/install.sh b/install.sh
@@ -6,7 +6,7 @@ apt-get update && apt-get install --yes --no-install-recommends apt-utils ca-cer
     apt-get --yes upgrade && apt-get install --yes --no-install-recommends sudo build-essential wget curl
 
 DEFAULT_RUST_VERSION=1.78.0
-DEFAULT_RUSTUP_VERSION=1.25.2
+DEFAULT_RUSTUP_VERSION=1.27.0
 RUST_VERSION=${1:-$DEFAULT_RUST_VERSION}
 RUSTUP_VERSION=${2:-$DEFAULT_RUSTUP_VERSION}
 
@@ -16,19 +16,19 @@ dpkgArch="$(dpkg --print-architecture)"
 case "${dpkgArch##*-}" in
 amd64)
     rustArch='x86_64-unknown-linux-gnu'
-    rustupSha256='bb31eaf643926b2ee9f4d8d6fc0e2835e03c0a60f34d324048aa194f0b29a71c'
+    rustupSha256='a3d541a5484c8fa2f1c21478a6f6c505a778d473c21d60a18a4df5185d320ef8'
     ;;
 armhf)
     rustArch='armv7-unknown-linux-gnueabihf'
-    rustupSha256='6626b90205d7fe7058754c8e993b7efd91dedc6833a11a225b296b7c2941194f'
+    rustupSha256='7cff34808434a28d5a697593cd7a46cefdf59c4670021debccd4c86afde0ff76'
     ;;
 arm64)
     rustArch='aarch64-unknown-linux-gnu'
-    rustupSha256='4ccaa7de6b8be1569f6b764acc28e84f5eca342f5162cd5c810891bff7ed7f74'
+    rustupSha256='76cd420cb8a82e540025c5f97bda3c65ceb0b0661d5843e6ef177479813b0367'
     ;;
 i386)
     rustArch='i686-unknown-linux-gnu'
-    rustupSha256='34392b53a25c56435b411d3e575b63aab962034dd1409ba405e708610c829607'
+    rustupSha256='cacdd10eb5ec58498cd95dbb7191fdab5fa4343e05daaf0fb7cdcae63be0a272'
     ;;
 *)
     echo >&2 "unsupported architecture: ${dpkgArch}"