Skip to content

Commit d73ddc9

Browse files
strobilmorgan-dgk
authored andcommitted
fix: check if sshd is already installed in container
1 parent cd6937b commit d73ddc9

2 files changed

Lines changed: 7 additions & 8 deletions

File tree

composer_local_dev/docker_files/entrypoint.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,13 @@ create_user() {
103103
}
104104

105105
install_and_run_sshd() {
106-
echo "Installing and running sshd"
107-
sudo apt-get -qq update && sudo DEBIAN_FRONTEND=noninteractive apt-get -qqy install openssh-server > /dev/null 2>&1
108-
sudo mkdir /run/sshd
109-
echo "airflow:${COMPOSER_CONTAINER_AIRFLOW_USER_PASSWORD}" | sudo chpasswd
106+
echo "Installing sshd"
107+
if ! command -v /usr/sbin/sshd &> /dev/null
108+
then
109+
sudo apt-get -qq update && sudo DEBIAN_FRONTEND=noninteractive apt-get -qqy install openssh-server > /dev/null 2>&1
110+
sudo mkdir /run/sshd
111+
echo "airflow:${COMPOSER_CONTAINER_AIRFLOW_USER_PASSWORD}" | sudo chpasswd
112+
fi
110113
sudo /usr/sbin/sshd
111114
}
112115

composer_local_dev/environment.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -833,13 +833,10 @@ def create_docker_container(self):
833833
self.requirements_file,
834834
db_mounts,
835835
)
836-
837836
db_vars = db_extras["env_vars"]
838837
default_vars = self.get_default_environment_variables(db_vars, self.enable_ssh)
839838

840839
env_vars = {**default_vars, **self.environment_vars}
841-
842-
843840
if (
844841
platform.system() == "Windows"
845842
and env_vars["COMPOSER_CONTAINER_RUN_AS_HOST_USER"] == "True"
@@ -851,7 +848,6 @@ def create_docker_container(self):
851848
ports = {
852849
f"8080/tcp": self.port,
853850
}
854-
855851
entrypoint = f"bash {constants.ENTRYPOINT_PATH}"
856852
memory_limit = (
857853
self.container_memory_limit

0 commit comments

Comments
 (0)