Skip to content

Commit

Permalink
Fix: Debian 11 Bullseye is deprecated, remove it
Browse files Browse the repository at this point in the history
Debian 11 provided Python 3.9.

This branch removes the support for both Debian 11 and Python 3.9.
The oldest distribution supported is now Ubuntu 22.04 with Python 3.10.

That that mentions of Debian 11 were replaced in
some example files that were not maintained and
the change has not been tested. These remain to
serve as examples for developers.
  • Loading branch information
hoh committed Sep 9, 2024
1 parent 1c888e2 commit fbbbf3d
Show file tree
Hide file tree
Showing 20 changed files with 1,001 additions and 1,282 deletions.
9 changes: 2 additions & 7 deletions .github/workflows/build-deb-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,8 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ["debian-11", "debian-12", "ubuntu-22.04"]
os: ["debian-12", "ubuntu-22.04", "ubuntu-24.04"]
include:
- os: "debian-11"
make_target: "all-podman-debian-11"
artifact_name: "aleph-vm.debian-11.deb"
- os: "debian-12"
make_target: "all-podman-debian-12"
artifact_name: "aleph-vm.debian-12.deb"
Expand Down Expand Up @@ -56,10 +53,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
os: ["debian-11", "debian-12"]
os: ["debian-12"]
include:
- os: "debian-11"
artifact_name: "aleph-debian-11-python.squashfs"
- os: "debian-12"
artifact_name: "aleph-debian-12-python.squashfs"
steps:
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/test-on-droplets-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,6 @@ jobs:

# Check compatibility with all supported OSes.
os_config:
- os_name: "Debian 11"
os_image: "debian-11-x64"
alias: "debian-11"
package_build_command: "all-podman-debian-11"
package_name: "aleph-vm.debian-11.deb"
concurrency_group: "droplet-aleph-vm-debian-11"

- os_name: "Debian 12"
os_image: "debian-12-x64"
alias: "debian-12"
Expand Down
2 changes: 1 addition & 1 deletion docker/vm_supervisor-dev.dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This is mainly a copy of the installation instructions from [orchestrator/README.md]

FROM debian:bullseye
FROM debian:bookworm

RUN apt-get update && apt-get -y upgrade && apt-get install -y \
sudo acl curl squashfs-tools git \
Expand Down
2 changes: 1 addition & 1 deletion examples/example_http_js/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16-bullseye
FROM node:16-bookworm

RUN apt-get update && apt-get -y upgrade && apt-get install -y \
libsecp256k1-dev \
Expand Down
2 changes: 1 addition & 1 deletion examples/example_http_rust/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:bullseye
FROM rust:bookworm

RUN apt-get update && apt-get -y upgrade && apt-get install -y \
libsecp256k1-dev \
Expand Down
2 changes: 1 addition & 1 deletion examples/volumes/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bullseye
FROM debian:bookworm

RUN apt-get update && apt-get -y upgrade && apt-get install -y \
python3-venv \
Expand Down
35 changes: 10 additions & 25 deletions packaging/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,6 @@ clean:
rm -fr ./aleph-vm/opt/aleph-vm/
rm -fr ./sevctl/target/

all-podman-debian-11: version
cd .. && podman build -t localhost/aleph-vm-packaging-debian-11:latest -f ./packaging/debian-11.dockerfile .
mkdir -p ./target
podman run --rm -ti \
-w /opt/packaging \
-v ./target:/opt/packaging/target \
localhost/aleph-vm-packaging-debian-11:latest \
make
file target/aleph-vm.deb
mv target/aleph-vm.deb target/aleph-vm.debian-11.deb

all-podman-debian-12: version
cd .. && podman build -t localhost/aleph-vm-packaging-debian-12:latest -f ./packaging/debian-12.dockerfile .
mkdir -p ./target
Expand Down Expand Up @@ -116,22 +105,13 @@ all-podman-ubuntu-2404: version
file target/aleph-vm.deb
mv target/aleph-vm.deb target/aleph-vm.ubuntu-24.04.deb

# extract Python requirements from Debian 11 container
requirements-debian-11: all-podman-debian-11
podman run --rm -ti \
-v ./target/aleph-vm.debian-11.deb:/opt/packaging/target/aleph-vm.deb:ro \
-v ./extract_requirements.sh:/opt/extract_requirements.sh:ro \
-v ./requirements-debian-11.txt:/mnt/requirements-debian-11.txt \
debian:bullseye \
bash -c "/opt/extract_requirements.sh /mnt/requirements-debian-11.txt"

# extract Python requirements from Debian 12 container
requirements-debian-12: all-podman-debian-12
podman run --rm -ti \
-v ./target/aleph-vm.debian-12.deb:/opt/packaging/target/aleph-vm.deb:ro \
-v ./extract_requirements.sh:/opt/extract_requirements.sh:ro \
-v ./requirements-debian-12.txt:/mnt/requirements-debian-12.txt \
debian:bullseye \
debian:bookworm \
bash -c "/opt/extract_requirements.sh /mnt/requirements-debian-12.txt"

# extract Python requirements from Ubuntu 22.04 container
Expand All @@ -153,13 +133,18 @@ requirements-ubuntu-24.04: all-podman-ubuntu-2404
bash -c "/opt/extract_requirements.sh /mnt/requirements-ubuntu-24.04.txt"

# run on host in order to sign with GPG
repository-bullseye:
cd ./repositories/bullseye && reprepro -Vb . includedeb bullseye ../../target/aleph-vm.debian-11.deb && cd ..
repository-bookworm:
cd ./repositories/bookworm && reprepro -Vb . includedeb bookworm ../../target/aleph-vm.debian-12.deb && cd ..

# run on host in order to sign with GPG
repository-jammy:
cd ./repositories/jammy && reprepro -Vb . includedeb jammy ../../target/aleph-vm.ubuntu-22.04.deb && cd ..

repositories: repository-bullseye repository-jammy
# run on host in order to sign with GPG
repository-noble:
cd ./repositories/noble && reprepro -Vb . includedeb noble ../../target/aleph-vm.ubuntu-24.04.deb && cd ..

repositories: repository-bookworm repository-jammy repository-noble

all-podman: all-podman-debian-12 all-podman-ubuntu-2204 all-podman-ubuntu-2404 repositories

all-podman: all-podman-debian-11 all-podman-ubuntu-2204 repositories
16 changes: 0 additions & 16 deletions packaging/debian-11.dockerfile

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Origin: Aleph-IM
Label: aleph-im
Suite: stable
Codename: bullseye
Codename: bookworm
Version: 3.0
Architectures: amd64 source
Components: contrib
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ norecursedirs = [
]

[tool.black]
target-version = ["py39"]
target-version = ["py310"]
line-length = 120
#skip-string-normalization = true

Expand Down
106 changes: 0 additions & 106 deletions runtimes/aleph-debian-11-python/create_disk_image.sh

This file was deleted.

56 changes: 0 additions & 56 deletions runtimes/aleph-debian-11-python/init0.sh

This file was deleted.

Loading

0 comments on commit fbbbf3d

Please sign in to comment.