From a77792eaa51c6543dbbed5e83ff895a5eabd4c27 Mon Sep 17 00:00:00 2001
From: nesteroff561 <nesteroff561@Airnesteroff561.nesteroff561.local>
Date: Fri, 30 May 2025 20:52:25 +0300
Subject: [PATCH] Changing build script

---
 .gitlab-ci.yml     | 72 ++++++++++++++++++++++++++++++++++++++++++++++
 Dockerfile-builder |  4 +++
 2 files changed, 76 insertions(+)
 create mode 100644 .gitlab-ci.yml
 create mode 100644 Dockerfile-builder

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..dee3d03
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,72 @@
+<<<<<<< HEAD
+stages:
+ - prebuild
+ - build
+ - postbuild
+prebuild:
+ stage: prebuild
+ rules:
+    - if: '$CI_COMMIT_TAG'
+ tags:
+  - Builder-1
+ script:
+  - docker build --no-cache -f Dockerfile-builder -t builder:latest .
+
+tileos-sway-amd64:
+ when: manual
+ stage: build
+ variables:
+   DESKTOP: sway
+ tags:
+  - iso-builder
+ script:
+  - 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 -e DESKTOP=sway builder:latest /bin/bash -s etc/terraform.conf < build.sh
+  - ssh -o StrictHostKeyChecking=no tileos@tileos rm -rf /media/iso/tile-os/testing/sway/*
+  - scp -o StrictHostKeyChecking=no -p -B ${CI_PROJECT_DIR}/output/amd64/* tileos@tileos:/media/iso/tile-os/testing/sway/
+
+tileos-river-amd64:
+ rules:
+    - if: '$CI_COMMIT_TAG'
+ when: manual
+ stage: build
+ variables:
+   DESKTOP: sway
+ tags:
+  - Builder-1
+ script:
+  - 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 -e DESKTOP=river builder:latest /bin/bash -s etc/terraform.conf < build.sh
+  - ssh -o StrictHostKeyChecking=no tileos@tileos rm -rf /media/iso/tile-os/testing/river/*
+  - scp -o StrictHostKeyChecking=no -p -B ${CI_PROJECT_DIR}/output/amd64/* tileos@tileos:/media/iso/tile-os/testing/river/
+
+mrproper:
+ rules:
+    - if: '$CI_COMMIT_TAG'
+ stage: postbuild
+ when: on_success
+ tags:
+  - Builder-1
+ needs:
+  - tileos-sway-amd64
+  - tileos-river-amd64
+ script:
+  - docker system prune -a -f
+=======
+build:
+ when: manual
+ stage: build
+ script:
+  - docker run --privileged -i -v /proc:/proc -v ${PWD}:/working_dir -w /working_dir -e DESKTOP=sway debian:latest /bin/bash -s etc/terraform.conf < build.sh
+ 
+>>>>>>> 4af10dc (Adding CI)
diff --git a/Dockerfile-builder b/Dockerfile-builder
new file mode 100644
index 0000000..25b20b4
--- /dev/null
+++ b/Dockerfile-builder
@@ -0,0 +1,4 @@
+FROM debian:bookworm
+RUN echo 'Acquire::http::Proxy "http://10.10.50.23:3142";' > /etc/apt/apt.conf.d/00aptproxy
+WORKDIR /builder
+COPY . /builder/