Skip to content

Commit f6155eb

Browse files
committed
Revert "Ensure docker stops on cancel"
This reverts commit 91a0cb4.
1 parent 8b94e4f commit f6155eb

File tree

3 files changed

+13
-85
lines changed

3 files changed

+13
-85
lines changed

.github/workflows/build-trios-trixie-dev.yml

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -36,38 +36,14 @@ jobs:
3636
run: |
3737
docker build -t trios-builder .
3838
39-
- name: Run Docker Container (Privileged, auto-stop on cancel)
40-
shell: bash
39+
- name: Run Docker Container (Privileged)
4140
run: |
42-
set -euo pipefail
43-
44-
# Create unique container name based on runner name
45-
_container_name="trios-builder-${{ runner.name }}"
46-
echo "Container name: ${_container_name}"
47-
48-
# Start the container in detached mode
49-
docker run -d \
41+
docker run --rm -i \
5042
--privileged \
51-
--name "${_container_name}" \
52-
-v "${{ github.workspace }}/Trixie:/TriOs" \
53-
-v "${{ github.workspace }}/TriOs_Output:/TriOs_Output" \
43+
-v "./Trixie:/TriOs" \
44+
-v "./TriOs_Output:/TriOs_Output" \
5445
trios-builder
5546
56-
# Trap ensures cleanup on cancel, error, or job end
57-
trap "echo 'Stopping container ${_container_name}...'; docker stop ${_container_name} || true; docker rm ${_container_name} || true" EXIT SIGINT SIGTERM
58-
59-
echo "Running ISO build inside container..."
60-
docker exec "${_container_name}" /TriOs/build.sh || {
61-
echo 'Build failed — stopping container...';
62-
docker stop "${_container_name}" || true;
63-
docker rm "${_container_name}" || true;
64-
exit 1;
65-
}
66-
67-
echo "Build complete — stopping container..."
68-
docker stop "${_container_name}" || true
69-
docker rm "${_container_name}" || true
70-
7147
- name: Verify ISO Output
7248
run: |
7349
ls -lh ./TriOs_Output || true

.github/workflows/build-trios-trixie-nightly.yml

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -40,38 +40,14 @@ jobs:
4040
run: |
4141
docker build -t trios-builder .
4242
43-
- name: Run Docker Container (Privileged, auto-stop on cancel)
44-
shell: bash
43+
- name: Run Docker Container (Privileged)
4544
run: |
46-
set -euo pipefail
47-
48-
# Create a unique container name based on the runner name
49-
_container_name="trios-builder-${{ runner.name }}"
50-
echo "Container name: ${_container_name}"
51-
52-
# Start the container in detached mode
53-
docker run -d \
45+
docker run --rm -i \
5446
--privileged \
55-
--name "${_container_name}" \
56-
-v "${{ github.workspace }}/Trixie:/TriOs" \
57-
-v "${{ github.workspace }}/TriOs_Output:/TriOs_Output" \
47+
-v "./Trixie:/TriOs" \
48+
-v "./TriOs_Output:/TriOs_Output" \
5849
trios-builder
5950
60-
# Trap ensures cleanup on cancel, error, or job end
61-
trap "echo 'Stopping container ${_container_name}...'; docker stop ${_container_name} || true; docker rm ${_container_name} || true" EXIT SIGINT SIGTERM
62-
63-
echo "Running ISO build inside container..."
64-
docker exec "${_container_name}" /TriOs/build.sh || {
65-
echo 'Build failed — stopping container...';
66-
docker stop "${_container_name}" || true;
67-
docker rm "${_container_name}" || true;
68-
exit 1;
69-
}
70-
71-
echo "Build complete — stopping container..."
72-
docker stop "${_container_name}" || true
73-
docker rm "${_container_name}" || true
74-
7551
- name: Verify ISO Output
7652
run: |
7753
ls -lh ./TriOs_Output || true

.github/workflows/build-trios-trixie-prod.yml

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
id: vars
2222
shell: bash
2323
run: |
24+
2425
if [ -f ./TriOs/Trixie/release_name ]; then
2526
_version=$(cat ./TriOs/Trixie/release_name | tr -d '\n\r')
2627
else
@@ -40,39 +41,14 @@ jobs:
4041
run: |
4142
docker build -t trios-builder .
4243
43-
- name: Run Docker Container (Privileged, auto-stop on cancel)
44-
shell: bash
44+
- name: Run Docker Container (Privileged)
4545
run: |
46-
set -euo pipefail
47-
48-
# Create a unique container name using the runner name
49-
_container_name="trios-builder-${{ runner.name }}"
50-
51-
echo "Container name: ${_container_name}"
52-
53-
# Start container in detached mode
54-
docker run -d \
46+
docker run --rm -i \
5547
--privileged \
56-
--name "${_container_name}" \
57-
-v "${{ github.workspace }}/Trixie:/TriOs" \
58-
-v "${{ github.workspace }}/TriOs_Output:/TriOs_Output" \
48+
-v "./Trixie:/TriOs" \
49+
-v "./TriOs_Output:/TriOs_Output" \
5950
trios-builder
6051
61-
# Ensure the container is stopped and removed if job is cancelled or ends
62-
trap "echo 'Stopping container ${_container_name}...'; docker stop ${_container_name} || true; docker rm ${_container_name} || true" EXIT SIGINT SIGTERM
63-
64-
echo "Running ISO build inside container..."
65-
docker exec "${_container_name}" /TriOs/build.sh || {
66-
echo 'Build failed — stopping container...';
67-
docker stop "${_container_name}" || true;
68-
docker rm "${_container_name}" || true;
69-
exit 1;
70-
}
71-
72-
echo "Build complete — stopping container..."
73-
docker stop "${_container_name}" || true
74-
docker rm "${_container_name}" || true
75-
7652
- name: Verify ISO Output
7753
run: |
7854
ls -lh ./TriOs_Output || true

0 commit comments

Comments
 (0)