revert: ubuntu24.04

the-soloist · May 31, 2024 · 2babfa3 · 2babfa3
1 parent 94c36b0
commit 2babfa3
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/README.md b/README.md
@@ -84,7 +84,7 @@ docker compose -f docker-compose-dev.yml build <service-name>
 | th3s/pwn-env:ubuntu-22.10 | Ubuntu 22.10 | 2.36      | 22210 -> 22  | 62210 -> 8888   |
 | th3s/pwn-env:ubuntu-23.04 | Ubuntu 23.04 | 2.37      | 22304 -> 22  | 62304 -> 8888   |
 | th3s/pwn-env:ubuntu-23.10 | Ubuntu 23.10 | 2.38      | 22310 -> 22  | 62310 -> 8888   |
-| th3s/pwn-env:ubuntu-24.04 | Ubuntu 23.10 | 2.39      | 22404 -> 22  | 62404 -> 8888   |
+| th3s/pwn-env:ubuntu-24.04 (waiting fix) | Ubuntu 24.04 | 2.39      | 22404 -> 22  | 62404 -> 8888   |
 
 #### compose volumes 映射
 

diff --git a/build/ubuntu/lts/24.04/Dockerfile b/build/ubuntu/lts/24.04/Dockerfile
@@ -56,9 +56,6 @@ RUN apt-get update && \
     apt-get install -y gdb gdbserver strace socat openssh-server net-tools iputils-ping && \
     apt-get install -y git vim tmux wget curl sshfs
 
-# temporary fix error: externally-managed-environment
-RUN mv /usr/lib/python3.12/EXTERNALLY-MANAGED /usr/lib/python3.12/EXTERNALLY-MANAGED.bak
-
 # install pwn tools
 RUN pip3 install pip --upgrade
 RUN pip3 install prettytable colorama loguru tqdm && \

diff --git a/scripts/build-lts-images.sh b/scripts/build-lts-images.sh
@@ -13,7 +13,6 @@ function remove_images() {
     docker rmi th3s/pwn-env:ubuntu-18.04
     docker rmi th3s/pwn-env:ubuntu-20.04
     docker rmi th3s/pwn-env:ubuntu-22.04
-    docker rmi th3s/pwn-env:ubuntu-24.04
 }
 
 docker compose down
@@ -29,4 +28,3 @@ docker compose pull ubuntu-16.04
 docker compose pull ubuntu-18.04
 docker compose pull ubuntu-20.04
 docker compose pull ubuntu-22.04
-docker compose pull ubuntu-24.04