Skip to content

Commit bf6725b

Browse files
committed
chore: always extract the archive to /
1 parent 5f9e082 commit bf6725b

File tree

2 files changed

+2
-13
lines changed

2 files changed

+2
-13
lines changed

docker/all-in-one/entrypoint.sh

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -221,16 +221,8 @@ function fetch_and_execute_delegated_payload {
221221

222222
# only extract a valid archive
223223
if [[ $(tar -tzf $DELEGATED_ARCHIVE_PATH) ]]; then
224-
if [ -d /data/delegated-init ]; then
225-
# Only extract newer tar archives
226-
TAR_MTIME=$(stat -c "%Y" $DELEGATED_ARCHIVE_PATH)
227-
DIR_MTIME=$(stat -c "%Y" /data/delegated-init)
228-
if [ $TAR_MTIME -gt $DIR_MTIME ]; then
229-
tar -xvzf $DELEGATED_ARCHIVE_PATH -C /data
230-
fi
231-
else
232-
tar -xvzf $DELEGATED_ARCHIVE_PATH -C /data
233-
fi
224+
# TODO: (tom) Only extract newer tar archives
225+
tar -xvzf $DELEGATED_ARCHIVE_PATH -C /
234226
fi
235227

236228
# Run our delegated entry script here

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@ file_roots:
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:
69-
#pillar_roots:
70-
# base:
71-
# - /srv/pillar
7269
pillar_roots:
7370
base:
7471
- /opt/salt/pillar

0 commit comments

Comments
 (0)