Skip to content

Commit da17737

Browse files
authored
Merge pull request #81 from thin-edge/feat-s6-overlay-services
feat(packaging): add s6-overlay service definitions to alpine package
2 parents 62d2cc2 + 39f8fdf commit da17737

File tree

9 files changed

+47
-0
lines changed

9 files changed

+47
-0
lines changed

.goreleaser.yaml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,42 @@ nfpms:
122122
mode: 0644
123123
owner: tedge
124124
group: tedge
125+
packager: deb
126+
127+
- src: ./packaging/services/systemd/tedge-container-plugin.service
128+
dst: /usr/lib/systemd/system/tedge-container-plugin.service
129+
file_info:
130+
mode: 0644
131+
owner: tedge
132+
group: tedge
133+
packager: rpm
134+
135+
- src: ./packaging/services/init.d/service.init
136+
dst: /etc/init.d/tedge-container-plugin
137+
file_info:
138+
mode: 0644
139+
owner: tedge
140+
group: tedge
141+
packager: deb
125142

126143
- src: ./packaging/services/init.d/service.init
127144
dst: /etc/init.d/tedge-container-plugin
128145
file_info:
129146
mode: 0644
130147
owner: tedge
131148
group: tedge
149+
packager: rpm
150+
151+
# s6-overlay services
152+
- src: ./packaging/services/s6-overlay/tedge-container-plugin
153+
dst: /etc/s6-overlay/s6-rc.d/tedge-container-plugin
154+
packager: apk
155+
type: tree
156+
157+
- src: ./packaging/services/s6-overlay/tedge-container-plugin-log
158+
dst: /etc/s6-overlay/s6-rc.d/tedge-container-plugin-log
159+
packager: apk
160+
type: tree
132161

133162
# Completions
134163
- src: ./output/completions.bash
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
tedge-container-plugin
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
tedge-container-plugin-pipeline
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/command/execlineb -P
2+
s6-format-filter "\033[34m%1 |\033[0m %s" "tedge-container-plugin"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
longrun

packaging/services/s6-overlay/tedge-container-plugin/dependencies.d/base

Whitespace-only changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
tedge-container-plugin-log
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/command/with-contenv sh
2+
if [ "${SERVICE_TEDGE_CONTAINER_PLUGIN:-1}" -eq 0 ]; then
3+
# Disable service and don't start again
4+
# https://github.com/just-containers/s6-overlay/issues/394
5+
s6-svc -O .
6+
exit 0
7+
fi
8+
tedge init ||:
9+
10+
exec 2>&1
11+
exec $COMMAND $COMMAND_ARGS
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
longrun

0 commit comments

Comments
 (0)