Skip to content

Commit 196542c

Browse files
set os and unnattended as envs
1 parent bf756ea commit 196542c

File tree

4 files changed

+27
-29
lines changed

4 files changed

+27
-29
lines changed

.github/workflows/artifacts.yml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,9 @@ jobs:
7171
# Debian ISO ATTENDED
7272
- name: Build Debian attended
7373
run: |
74-
sed -i -e "/BASE_OS/s/ubuntu/debian/" docker-compose.yml
75-
sed -i -e "/UNATTENDED/s/true/false/" docker-compose.yml
76-
docker compose build
77-
docker compose up
74+
export BASE_OS=debian
75+
export UNATTENDED=false
76+
docker compose up --build
7877
7978
- name: Check Debian ISO attended
8079
run: |
@@ -89,10 +88,9 @@ jobs:
8988
# Debian ISO UNATTENDED
9089
- name: Build Debian unattended
9190
run: |
92-
sed -i -e "/BASE_OS/s/ubuntu/debian/" docker-compose.yml
93-
sed -i -e "/UNATTENDED/s/false/true/" docker-compose.yml
94-
docker compose build
95-
docker compose up
91+
export BASE_OS=debian
92+
export UNATTENDED=true
93+
docker compose up --build
9694
9795
- name: Check Debian ISO unattended
9896
run: |
@@ -111,8 +109,8 @@ jobs:
111109
# Ubuntu ISO ATTENDED
112110
- name: Build Ubuntu attended
113111
run: |
114-
sed -i -e "/BASE_OS/s/debian/ubuntu/" docker-compose.yml
115-
sed -i -e "/UNATTENDED/s/true/false/" docker-compose.yml
112+
export BASE_OS=ubuntu
113+
export UNATTENDED=false
116114
docker compose up --build
117115
118116
- name: Check Ubuntu ISO attended
@@ -128,8 +126,8 @@ jobs:
128126
# Ubuntu ISO UNATTENDED
129127
- name: Build Ubuntu unattended
130128
run: |
131-
sed -i -e "/BASE_OS/s/ubuntu/debian/" docker-compose.yml
132-
sed -i -e "/UNATTENDED/s/false/true/" docker-compose.yml
129+
export BASE_OS=ubuntu
130+
export UNATTENDED=true
133131
docker compose up --build
134132
135133
- name: Check Ubuntu ISO unattended

.github/workflows/release.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,9 @@ jobs:
6868
6969
- name: Build Debian attended
7070
run: |
71-
sed -i -e "/BASE_OS/s/ubuntu/debian/" docker-compose.yml
72-
sed -i -e "/UNATTENDED/s/true/false/" docker-compose.yml
73-
docker compose build
74-
docker compose up
71+
export BASE_OS=debian
72+
export UNATTENDED=false
73+
docker compose up --build
7574
7675
- name: Check Debian ISO attended
7776
run: |
@@ -85,7 +84,8 @@ jobs:
8584
8685
- name: Build Debian unattended
8786
run: |
88-
sed -i -e "/UNATTENDED/s/false/true/" docker-compose.yml
87+
export BASE_OS=debian
88+
export UNATTENDED=true
8989
docker compose build
9090
docker compose up
9191
@@ -102,8 +102,8 @@ jobs:
102102
103103
# - name: Build Ubuntu attended
104104
# run: |
105-
# sed -i -e "/BASE_OS/s/debian/ubuntu/" docker-compose.yml
106-
# sed -i -e "/UNATTENDED/s/true/false/" docker-compose.yml
105+
# export BASE_OS=ubuntu
106+
# export UNATTENDED=false
107107
# docker compose up --build
108108

109109
# - name: Check Ubuntu ISO attended
@@ -118,8 +118,8 @@ jobs:
118118

119119
- name: Build Ubuntu unattended
120120
run: |
121-
sed -i -e "/BASE_OS/s/ubuntu/debian/" docker-compose.yml
122-
sed -i -e "/UNATTENDED/s/false/true/" docker-compose.yml
121+
export BASE_OS=ubuntu
122+
export UNATTENDED=true
123123
docker compose up --build
124124
125125
- name: Check Ubuntu ISO unattended

.github/workflows/test.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ jobs:
4242
# Create Debian ISO
4343
- name: create Debian ISO
4444
run: |
45-
sed -i -e "/BASE_OS/s/ubuntu/debian/" docker-compose.yml
46-
docker compose build
47-
docker compose up
45+
export BASE_OS=debian
46+
export UNATTENDED=true
47+
docker compose up --build
4848
ls images/
4949
5050
# Verify Debian ISO creation
@@ -55,9 +55,9 @@ jobs:
5555
# Create Ubuntu ISO
5656
- name: create Ubuntu ISO
5757
run: |
58-
sed -i -e "/BASE_OS/s/debian/ubuntu/" docker-compose.yml
59-
docker compose build
60-
docker compose up
58+
export BASE_OS=ubuntu
59+
export UNATTENDED=true
60+
docker compose up --build
6161
ls images/
6262
6363
# Verify Ubuntu ISO creation

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ services:
77
environment:
88
- BUILD=false # In case you want to re-generate a all the images, not recommended
99
- CLEAN=true # it remove the images directory
10-
- UNATTENDED=false # UNATTENDED version
11-
- BASE_OS=debian # Base OS version (debian or ubuntu)
10+
- UNATTENDED=${UNATTENDED} # UNATTENDED version
11+
- BASE_OS=${BASE_OS} # Base OS version (debian or ubuntu)
1212
volumes:
1313
- ./images:/images
1414
- "/var/run/docker.sock:/var/run/docker.sock"

0 commit comments

Comments
 (0)