Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Ubuntu 24. #45 PARTIAL; see ticket. #46

Merged
merged 1 commit into from
Apr 26, 2024
+23 −4
Merged

Add support for Ubuntu 24. #45 PARTIAL; see ticket. #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/docker-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
strategy:
fail-fast: true
matrix:
os: [ 'el7', 'el8', 'ol8', 'el9', 'd11', 'd12', 'u18', 'u20', 'u22' ]
os: [ 'el7', 'el8', 'ol8', 'el9', 'd11', 'd12', 'u18', 'u20', 'u22', 'u24' ]

runs-on: ubuntu-latest
permissions:
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
# https://github.com/docker/build-push-action
- name: Build and push Docker multiarch images
id: build-and-push-multiarch
if: ${{ matrix.os == 'd11' || matrix.os == 'd12' || matrix.os == 'u18' || matrix.os == 'u20' || matrix.os == 'u22' }}
if: ${{ matrix.os == 'd11' || matrix.os == 'd12' || matrix.os == 'u18' || matrix.os == 'u20' || matrix.os == 'u22' || matrix.os == 'u24' }}
uses: docker/build-push-action@v3
with:
context: .
Expand Down
18 changes: 18 additions & 0 deletions docker-envs/Dockerfile-u24
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM ubuntu:24.04 AS unibuild-image

# Install pre-requisites for building packages
RUN DEBIAN_FRONTEND=noninteractive apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y sudo apt-utils curl emacs-nox gnupg htop m4 make pylint rsync screen tree vim

# Copy unibuild source
COPY . /usr/share/unibuild/

# Install unibuild
WORKDIR /usr/share/unibuild
RUN make RELEASE=1
RUN /usr/share/unibuild/libexec/prep/prep

# Shared volume for code to build
VOLUME /app
WORKDIR /app
2 changes: 1 addition & 1 deletion docker-envs/build-dev-images
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ clear_cache=false
verbose=false
build_type=
registry=
declare -a OSimages=("d10" "d11" "d12" "u18" "u20" "u22")
declare -a OSimages=("d10" "d11" "d12" "u18" "u20" "u22" "u24")

while getopts "chr:v" OPT; do
case $OPT in
Expand Down
1 change: 1 addition & 0 deletions docker-envs/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,3 +129,4 @@ services:
platform: "linux/ppc64le"
image: ghcr.io/perfsonar/unibuild/u22:latest@sha256:91d5ba272ca73f62d18758d2a2cbad7e85ca9f5830680d44da90447006999046
volumes: *default-volumes
# TODO: Add u24_*
2 changes: 1 addition & 1 deletion docker-envs/update-sha256-images
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
my $filename = 'docker-compose.yml';
my $registry_path = 'ghcr.io/perfsonar/unibuild/';
my $registry_path_esc = $registry_path =~ s/\//\\\//gr;
my @OSimages = ('d10:latest', 'd11:latest', 'd12:latest', 'u18:latest', 'u20:latest', 'u22:latest');
my @OSimages = ('d10:latest', 'd11:latest', 'd12:latest', 'u18:latest', 'u20:latest', 'u22:latest', "u24:latest');
my $file, $newsha, $count=0;

# Announce what we'll do
Expand Down
Loading