Skip to content

Commit e518292

Browse files
authored
chore: aio - move delegated-init to /data dir (#1002)
1 parent ab38b11 commit e518292

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

docker/all-in-one/entrypoint.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,18 +222,18 @@ function fetch_and_execute_delegated_payload {
222222

223223
# only extract a valid archive
224224
if tar -tzf "$DELEGATED_ARCHIVE_PATH" &>/dev/null; then
225-
TAR_MTIME_EPOCH=$(tar -tvzf "$DELEGATED_ARCHIVE_PATH" data/delegated-entry.sh | awk '{print $4, $5}' | xargs -I {} date -d {} +%s)
225+
TAR_MTIME_EPOCH=$(tar -tvzf "$DELEGATED_ARCHIVE_PATH" delegated-entry.sh | awk '{print $4, $5}' | xargs -I {} date -d {} +%s)
226226

227227
if [ -f $DELEGATED_ENTRY_PATH ]; then
228228
FILE_MTIME_EPOCH=$(stat -c %Y "$DELEGATED_ENTRY_PATH")
229229

230230
if [ "$TAR_MTIME_EPOCH" -gt "$FILE_MTIME_EPOCH" ]; then
231-
tar -xvzf "$DELEGATED_ARCHIVE_PATH" -C /
231+
tar -xvzf "$DELEGATED_ARCHIVE_PATH" -C /data
232232
else
233233
echo "TAR archive is not newer, skipping extraction"
234234
fi
235235
else
236-
tar -xvzf "$DELEGATED_ARCHIVE_PATH" -C /
236+
tar -xvzf "$DELEGATED_ARCHIVE_PATH" -C /data
237237
fi
238238
else
239239
echo "Invalid TAR archive"

docker/all-in-one/etc/salt/minion

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ file_client: local
6161
#
6262
file_roots:
6363
base:
64-
- /opt/salt/state
64+
- /data/salt/state
6565

6666
# The Salt pillar is searched for locally if file_client is set to local. If
6767
# this is the case, and pillar data is defined, then the pillar_roots need to
6868
# also be configured on the minion:
6969
pillar_roots:
7070
base:
71-
- /opt/salt/pillar
71+
- /data/salt/pillar

0 commit comments

Comments
 (0)