diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d2eeb99..5452350 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,12 +23,10 @@ tileos-sway-amd64: - eval $(ssh-agent -s) - mkdir ~/.ssh/ - echo "$BASE64_TILEOS_ISO_STORAGE_KEY" | base64 -d > ~/.ssh/id_rsa - #- echo "$TILEOS_ISO_STORAGE_CONFIG" > ~/.ssh/config - #- chmod 644 ~/.ssh/config - 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 -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 -v ~/.ssh/id_rsa:~/.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/ tileos-river-amd64: #rules: @@ -44,12 +42,10 @@ tileos-river-amd64: - eval $(ssh-agent -s) - mkdir ~/.ssh/ - echo "$BASE64_TILEOS_ISO_STORAGE_KEY" | base64 -d > ~/.ssh/id_rsa - #- echo "$TILEOS_ISO_STORAGE_CONFIG" > ~/.ssh/config - #- chmod 644 ~/.ssh/config - 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 -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 -v ~/.ssh/id_rsa:~/.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/ mrproper: #rules: