TileOS/iso-builder
TileOS/iso-builder
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reverted back adding ssh key to root builder

Browse source
This commit is contained in:
nesteroff561 2025-06-01 02:39:04 +03:00
parent 2f552bb068
commit 93c086c45f
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.gitlab-ci.yml
View file

@ -21,10 +21,13 @@ tileos-sway-amd64:
tags:
- Builder-1
script:
- eval $(ssh-agent -s)
- echo "$BASE64_TILEOS_ISO_STORAGE_KEY" | base64 -d > ~/.ssh/id_rsa
- chmod 400 ~/.ssh/id_rsa
- rm -rf ${CI_PROJECT_DIR}/output/*
- 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 -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=/builder/id_rsa -p -B ${CI_PROJECT_DIR}/output/amd64/* ${STORAGE_USER}@${STORAGE_HOST}:/media/iso/tile-os/testing/sway/
tileos-river-amd64:
#rules:
@ -36,10 +39,13 @@ tileos-river-amd64:
tags:
- Builder-1
script:
- eval $(ssh-agent -s)
- echo "$BASE64_TILEOS_ISO_STORAGE_KEY" | base64 -d > ~/.ssh/id_rsa
- chmod 400 ~/.ssh/id_rsa
- rm -rf ${CI_PROJECT_DIR}/output/*
- 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 -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=/builder/id_rsa -p -B ${CI_PROJECT_DIR}/output/amd64/* ${STORAGE_USER}@${STORAGE_HOST}:/media/iso/tile-os/testing/river/
mrproper:
#rules:

3
Dockerfile-builder
View file

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