Skip to content

Commit

Permalink
move ssh to runner image
Browse files Browse the repository at this point in the history
  • Loading branch information
luke-lombardi committed Dec 27, 2024
1 parent 3cec36f commit f2b7ad3
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,10 @@ proxy:
docker push localhost:5001/beta9-proxy:$(tag)

runner:
for target in py312 py311 py310 py39 py38; do \
for target in py310; do \
docker build . --target $$target --platform=linux/arm64 -f ./docker/Dockerfile.runner -t localhost:5001/beta9-runner:$$target-$(runnerTag); \
docker push localhost:5001/beta9-runner:$$target-$(runnerTag); \
done
for version in "3.12" "3.11" "3.10" "3.9" "3.8"; do \
docker build . --build-arg PYTHON_VERSION=$$version --target micromamba --platform=linux/arm64 -f ./docker/Dockerfile.runner -t localhost:5001/beta9-runner:micromamba$$version-$(runnerTag); \
docker push localhost:5001/beta9-runner:micromamba$$version-$(runnerTag); \
done

start:
cd hack && okteto up --file okteto.yaml
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.runner
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN <<EOT
echo 'Acquire::ForceIPv4 "true";' | tee /etc/apt/apt.conf.d/1000-force-ipv4-transport
apt-get update
apt-get install -y software-properties-common curl git gcc python3-dev bzip2
apt-get install -y software-properties-common curl git gcc python3-dev bzip2 openssh-server
add-apt-repository ppa:deadsnakes/ppa
apt-get update
EOT
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.worker
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ RUN curl -L https://beam-runner-python-deps.s3.amazonaws.com/juicefs -o /usr/loc
RUN curl -fsSL https://tailscale.com/install.sh | sh
RUN apt-get install -y --no-install-recommends nvidia-container-toolkit-base nvidia-container-toolkit

RUN apt-get update && apt-get install -y fuse3 libfuse2 libfuse3-dev libfuse-dev bash-completion openssh-server
RUN apt-get update && apt-get install -y fuse3 libfuse2 libfuse3-dev libfuse-dev bash-completion

RUN apt-get install -y libbtrfs-dev libgpgme11-dev
RUN mkdir -p /etc/containers/registries.conf.d
Expand Down
12 changes: 8 additions & 4 deletions pkg/worker/base_runc_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -414,10 +414,14 @@
"options": ["ro", "rbind", "rprivate", "nosuid", "nodev"]
},
{
"destination": "/usr/sbin/sshd",
"type": "bind",
"source": "/usr/sbin/sshd",
"options": ["ro", "rbind", "rprivate", "nosuid", "nodev"]
"destination": "/run/sshd",
"type": "tmpfs",
"source": "tmpfs",
"options": [
"nosuid",
"nodev",
"mode=0755"
]
}
],
"hooks": {
Expand Down

0 comments on commit f2b7ad3

Please sign in to comment.