Fix issues with Docker and remove unneeded code

The-Academic-Observatory · Jun 15, 2023 · aaaafc7 · aaaafc7
1 parent 431da66
commit aaaafc7
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 98 deletions.
diff --git a/observatory-platform/observatory/platform/docker/Dockerfile.apiserver.jinja2 b/observatory-platform/observatory/platform/docker/Dockerfile.apiserver.jinja2
@@ -14,7 +14,7 @@
 
 # Author: Tuan Chien
 
-FROM python:3.9-slim
+FROM python:3.9.16-bullseye
 
 ARG HOST_USER_ID
 ARG OBSERVATORY_HOME=/opt/observatory

diff --git a/observatory-platform/observatory/platform/docker/Dockerfile.seed_db.jinja2 b/observatory-platform/observatory/platform/docker/Dockerfile.seed_db.jinja2
diff --git a/observatory-platform/observatory/platform/docker/platform_runner.py b/observatory-platform/observatory/platform/docker/platform_runner.py
@@ -63,12 +63,10 @@ def __init__(self, *, config: Config, host_uid: int = HOST_UID, docker_build_pat
             path=os.path.join(self.docker_module_path, "entrypoint-airflow.sh.jinja2"), config=self.config
         )
         self.add_template(path=os.path.join(self.docker_module_path, "Dockerfile.apiserver.jinja2"), config=self.config)
-        self.add_template(path=os.path.join(self.docker_module_path, "Dockerfile.seed_db.jinja2"), config=self.config)
         self.add_template(path=os.path.join(self.docker_module_path, "entrypoint-api.sh.jinja2"), config=self.config)
         self.add_file(
             path=os.path.join(self.docker_module_path, "entrypoint-root.sh"), output_file_name="entrypoint-root.sh"
         )
-        self.add_template(path=os.path.join(self.docker_module_path, "seed_db.sh.jinja2"), config=self.config)
 
         # Add all project requirements files for local projects
         for package in self.config.python_packages:

diff --git a/observatory-platform/observatory/platform/docker/seed_db.sh.jinja2 b/observatory-platform/observatory/platform/docker/seed_db.sh.jinja2
diff --git a/observatory-platform/observatory/platform/terraform/build.sh b/observatory-platform/observatory/platform/terraform/build.sh
@@ -4,6 +4,7 @@ echo " ----- Sleeping for 30 seconds as per Packer documentation ----- "
 sleep 30
 
 echo " ----- Install Docker and Docker Compose V2 (using apt-get) ----- "
+sudo apt-get update
 sudo apt-get -y install ca-certificates curl gnupg lsb-release
 sudo mkdir -p /etc/apt/keyrings
 curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg