drop work docker in favor of sec; image base to jammy

Tanq16 · May 16, 2024 · fab0be6 · fab0be6
1 parent 9f5703c
commit fab0be6
Show file tree

Hide file tree

Showing 15 changed files with 6 additions and 400 deletions.
diff --git a/.github/paused-work-build.yml b/.github/paused-work-build.yml
diff --git a/.github/workflows/work-build-arm.yml b/.github/workflows/work-build-arm.yml
diff --git a/security_docker_arm/Dockerfile b/security_docker_arm/Dockerfile
@@ -1,5 +1,5 @@
 FROM intermediate_builder as intermediate_builder
-FROM ubuntu
+FROM ubuntu:jammy
 
 # ============================================================================================================
 # ==================================================================== Environment and APT Installations =====

diff --git a/security_docker_arm/builder.Dockerfile b/security_docker_arm/builder.Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu AS executable_builder
+FROM ubuntu:jammy AS executable_builder
 RUN mkdir /executables && apt update -y && \
     apt install -y wget ninja-build gettext cmake unzip curl git file && \
     wget https://github.com/neovim/neovim/archive/refs/tags/stable.tar.gz && \

diff --git a/security_docker_arm/local-builder-script.sh b/security_docker_arm/local-builder-script.sh
@@ -1,4 +1,4 @@
-DOCKER_BUILDKIT=1 docker buildx build --platform linux/arm64 -f builder.Dockerfile -t intermediate_builder .
+DOCKER_BUILDKIT=1 docker build -f builder.Dockerfile -t intermediate_builder .
 docker builder prune -f
-DOCKER_BUILDKIT=1 docker buildx build --platform linux/arm64 -t tanq16/sec_docker:main_apple .
+DOCKER_BUILDKIT=1 docker build -t tanq16/sec_docker:main_apple .
 docker push tanq16/sec_docker:main_apple
diff --git a/security_docker_main/Dockerfile b/security_docker_main/Dockerfile
@@ -1,5 +1,5 @@
 FROM intermediate_builder as intermediate_builder
-FROM ubuntu
+FROM ubuntu:jammy
 
 # ============================================================================================================
 # ==================================================================== Environment and APT Installations =====

diff --git a/security_docker_main/builder.Dockerfile b/security_docker_main/builder.Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu AS executable_builder
+FROM ubuntu:jammy AS executable_builder
 RUN mkdir /executables && apt update -y && \
     apt install -y wget ninja-build gettext cmake unzip curl git file && \
     wget https://github.com/neovim/neovim/archive/refs/tags/stable.tar.gz && \

diff --git a/worker_docker_arm/Dockerfile b/worker_docker_arm/Dockerfile
diff --git a/worker_docker_arm/builder.Dockerfile b/worker_docker_arm/builder.Dockerfile
diff --git a/worker_docker_arm/ec2-builder-script.sh b/worker_docker_arm/ec2-builder-script.sh
diff --git a/worker_docker_arm/local-builder-script.sh b/worker_docker_arm/local-builder-script.sh