From 16c3792d126e81cb548127e9791491e211f3782d Mon Sep 17 00:00:00 2001
From: nesteroff561 <nesteroff561@Airnesteroff561.nesteroff561.local>
Date: Sat, 31 May 2025 22:18:35 +0300
Subject: [PATCH] Added upload inside docker container

---
 .gitlab-ci.yml     | 4 ++--
 Dockerfile-builder | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ccc33c0..d2eeb99 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,7 +28,7 @@ tileos-sway-amd64:
   - chmod 400 ~/.ssh/id_rsa
   - docker run --privileged --rm -i -v ${CI_PROJECT_DIR}/output:/builder/builds -v /proc:/proc builder:latest ./build --desktop sway --release testing
   - ssh -o StrictHostKeyChecking=no ${STORAGE_USER}@${STORAGE_HOST} -p ${STORAGE_PORT} -i ~/.ssh/id_rsa rm -rf /media/iso/tile-os/testing/sway/*
-  - scp -o StrictHostKeyChecking=no -o Port=${STORAGE_PORT} -o IdentityFile=~/.ssh/id_rsa -p -B ${CI_PROJECT_DIR}/output/amd64/ ${STORAGE_USER}@${STORAGE_HOST}:/media/iso/tile-os/testing/sway/
+  - docker run --rm -v ${CI_PROJECT_DIR}/output:/builder/builds -e STORAGE_PORT=${STORAGE_PORT} -e STORAGE_HOST=${STORAGE_HOST} -e STORAGE_USER=${STORAGE_USER} builder:latest scp -o StrictHostKeyChecking=no -o Port=${STORAGE_PORT} -o IdentityFile=~/.ssh/id_rsa -p -B ${CI_PROJECT_DIR}/output/amd64/* ${STORAGE_USER}@${STORAGE_HOST}:/media/iso/tile-os/testing/sway/
 
 tileos-river-amd64:
  #rules:
@@ -49,7 +49,7 @@ tileos-river-amd64:
   - chmod 400 ~/.ssh/id_rsa
   - docker run --privileged --rm -i -v ${CI_PROJECT_DIR}/output:/builder/builds -v /proc:/proc builder:latest ./build --desktop river --release testing
   - ssh -o StrictHostKeyChecking=no ${STORAGE_USER}@${STORAGE_HOST} -p ${STORAGE_PORT} -i ~/.ssh/id_rsa rm -rf /media/iso/tile-os/testing/river/*
-  - scp -o StrictHostKeyChecking=no -o Port=${STORAGE_PORT} -o IdentityFile=~/.ssh/id_rsa -p -B ${CI_PROJECT_DIR}/output/amd64/ ${STORAGE_USER}@${STORAGE_HOST}:/media/iso/tile-os/testing/river/
+  - docker run --rm -v ${CI_PROJECT_DIR}/output:/builder/builds -e STORAGE_PORT=${STORAGE_PORT} -e STORAGE_HOST=${STORAGE_HOST} -e STORAGE_USER=${STORAGE_USER} builder:latest scp -o StrictHostKeyChecking=no -o Port=${STORAGE_PORT} -o IdentityFile=~/.ssh/id_rsa -p -B ${CI_PROJECT_DIR}/output/amd64/* ${STORAGE_USER}@${STORAGE_HOST}:/media/iso/tile-os/testing/river/
 
 mrproper:
  #rules:
diff --git a/Dockerfile-builder b/Dockerfile-builder
index 25b20b4..8c07df0 100644
--- a/Dockerfile-builder
+++ b/Dockerfile-builder
@@ -1,4 +1,5 @@
 FROM debian:bookworm
 RUN echo 'Acquire::http::Proxy "http://10.10.50.23:3142";' > /etc/apt/apt.conf.d/00aptproxy
+RUN apt update && apt install -y openssh-client --no-install-recommends && rm -rf /var/lib/cache
 WORKDIR /builder
 COPY . /builder/