Revert "Update ubuntu in all dockerfile images. Corresponding changes…

… to bake targets names, folders and files (#218)" This reverts commit 7ae48ce.
datalens-tech · Jan 31, 2024 · 32d423b · 32d423b
1 parent 5202c4a
commit 32d423b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/docker_build/bake_apps.hcl b/docker_build/bake_apps.hcl
@@ -1,7 +1,7 @@
 target "dl_control_api" {
   pull     = false
   contexts = {
-    bake_ctx_base_img = "target:base_jammy_db"
+    bake_ctx_base_img = "target:base_focal_db"
     bake_ctx_src_lib  = "target:dl_src_lib"
     bake_ctx_metapkg  = "target:dl_src_metapkg"
   }
@@ -12,21 +12,21 @@ target "dl_control_api" {
 target "dl_data_api" {
   pull     = false
   contexts = {
-    bake_ctx_base_img = "target:base_jammy_db"
+    bake_ctx_base_img = "target:base_focal_db"
     bake_ctx_src_lib  = "target:dl_src_lib"
     bake_ctx_metapkg  = "target:dl_src_metapkg"
   }
   context    = "${DL_B_PROJECT_ROOT}/app/dl_data_api"
   dockerfile = "Dockerfile"
 }
 
-target "base_jammy_db" {
-  context  = "target_base_jammy_db"
+target "base_focal_db" {
+  context  = "target_base_focal_db"
   contexts = {
-    bake_ctx_base_img = "target:base_jammy"
+    bake_ctx_base_img = "target:base_focal"
   }
 }
 
-target "base_jammy" {
-  context = "target_base_jammy"
+target "base_focal" {
+  context = "target_base_focal"
 }
diff --git a/docker_build/target_base_jammy/Dockerfile → docker_build/target_base_focal/Dockerfile b/docker_build/target_base_jammy/Dockerfile → docker_build/target_base_focal/Dockerfile
@@ -1,5 +1,5 @@
 #syntax=docker/dockerfile:1.4
-FROM ubuntu:22.04
+FROM ubuntu:20.04
 
 # Installing deb tools
 ENV DEBIAN_FRONTEND noninteractive

diff --git a/...build/target_base_jammy/install_py_310.sh → ...build/target_base_focal/install_py_310.sh b/...build/target_base_jammy/install_py_310.sh → ...build/target_base_focal/install_py_310.sh
@@ -2,7 +2,7 @@
 
 set -exu
 
-echo 'deb http://ppa.launchpad.net/deadsnakes/ppa/ubuntu jammy main' > /etc/apt/sources.list.d/deadsnakes.list
+echo 'deb http://ppa.launchpad.net/deadsnakes/ppa/ubuntu focal main' > /etc/apt/sources.list.d/deadsnakes.list
 
 apt-get update
 

diff --git a/...t_base_jammy/trusted.gpg.d/deadsnakes.asc → ...t_base_focal/trusted.gpg.d/deadsnakes.asc b/...t_base_jammy/trusted.gpg.d/deadsnakes.asc → ...t_base_focal/trusted.gpg.d/deadsnakes.asc
diff --git a/docker_build/target_base_jammy_db/Dockerfile → docker_build/target_base_focal_db/Dockerfile b/docker_build/target_base_jammy_db/Dockerfile → docker_build/target_base_focal_db/Dockerfile