Fix supervisor openssh build with new Leeway version

Author: corneliusludmann

components/supervisor/BUILD.yaml

@@ -27,7 +27,7 @@ packages:
     deps:
       - :app
       - components/supervisor/frontend:app
-      - components/supervisor/openssh:app
+      - components/supervisor/openssh:docker-build
       - components/gitpod-cli:app
     argdeps:
       - imageRepoBase

components/supervisor/leeway.Dockerfile

@@ -28,9 +28,9 @@ COPY components-supervisor--app/supervisor \
      ./
 
 WORKDIR "/.supervisor/ssh"
-COPY components-supervisor-openssh--app/usr/sbin/sshd .
-COPY components-supervisor-openssh--app/usr/bin/ssh-keygen .
-COPY components-supervisor-openssh--app/usr/libexec/sshd-session .
+COPY components-supervisor-openssh--docker-build/content/content/usr/sbin/sshd .
+COPY components-supervisor-openssh--docker-build/content/content/usr/bin/ssh-keygen .
+COPY components-supervisor-openssh--docker-build/content/content/usr/libexec/sshd-session .
 
 COPY --from=docker_cli_builder /gp-docker/docker/docker /.supervisor/gitpod-docker-cli
 

components/supervisor/openssh/BUILD.yaml

@@ -1,12 +1,4 @@
 packages:
-  - name: app
-    type: generic
-    deps:
-      - :docker-build
-    config:
-      commands:
-        - ["sh", "-c","TARFILE=$(cat ./components-supervisor-openssh--docker-build/manifest.json | jq -r '.[].Layers[]') && tar xvf ./components-supervisor-openssh--docker-build/$TARFILE"]
-        - ["rm", "-rf", "components-supervisor-openssh--docker-build"]
   - name: docker-build
     type: docker
     config: