Modified ISO storage ssh key interaction

This commit is contained in:
nesteroff561 2025-06-01 01:47:12 +03:00
parent c5070ebd73
commit 2f552bb068
2 changed files with 6 additions and 10 deletions

View file

@ -9,6 +9,8 @@ prebuild:
tags:
- Builder-1
script:
- eval $(ssh-agent -s)
- echo "$BASE64_TILEOS_ISO_STORAGE_KEY" | base64 -d > ./id_rsa
- docker build --no-cache -f Dockerfile-builder -t builder:latest .
tileos-sway-amd64:
@ -20,13 +22,9 @@ tileos-sway-amd64:
- Builder-1
script:
- rm -rf ${CI_PROJECT_DIR}/output/*
- eval $(ssh-agent -s)
- mkdir ~/.ssh/
- echo "$BASE64_TILEOS_ISO_STORAGE_KEY" | base64 -d > ~/.ssh/id_rsa
- 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/*
- docker run --rm -v ${CI_PROJECT_DIR}/output:/builder/builds -v /root/.ssh/id_rsa:/root/.ssh/id_rsa -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/
- 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:
@ -39,13 +37,9 @@ tileos-river-amd64:
- Builder-1
script:
- rm -rf ${CI_PROJECT_DIR}/output/*
- eval $(ssh-agent -s)
- mkdir ~/.ssh/
- echo "$BASE64_TILEOS_ISO_STORAGE_KEY" | base64 -d > ~/.ssh/id_rsa
- 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/*
- docker run --rm -v ${CI_PROJECT_DIR}/output:/builder/builds -v /root/.ssh/id_rsa:/builder/.ssh/id_rsa -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/
- 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:

View file

@ -2,4 +2,6 @@ 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 ./id_rsa /root/.ssh/id_rsa
RUN chmod 400 /root/.ssh/id_rsa
COPY . /builder/