Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issues with Docker and remove unneeded code #622

Merged
merged 1 commit into from
Jun 19, 2023
Merged

Fix issues with Docker and remove unneeded code #622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion observatory-platform/observatory/platform/docker/Dockerfile.apiserver.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
67 changes: 0 additions & 67 deletions observatory-platform/observatory/platform/docker/Dockerfile.seed_db.jinja2
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions observatory-platform/observatory/platform/docker/platform_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
28 changes: 0 additions & 28 deletions observatory-platform/observatory/platform/docker/seed_db.sh.jinja2
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions observatory-platform/observatory/platform/terraform/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down