Skip to content

Commit

Permalink
Don't default to /etc/apk/repositories
Browse files Browse the repository at this point in the history
If /etc/apk/repositories exists, then --branch is completely ignored.
  • Loading branch information
jirutka committed Aug 20, 2023
1 parent 1c678e9 commit d49dac3
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions alpine-make-rootfs
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,8 @@
# -p --packages PACKAGES Additional packages to install into the rootfs.
#
# -r --repositories-file REPOS_FILE Path of repositories file to copy into the rootfs.
# Default is /etc/apk/repositories. If does not exist,
# repositories file with Alpine's main and community
# repositories on --mirror-uri is created.
# If not specified, a repositories file will be created with
# Alpine's main and community repositories on --mirror-uri.
#
# -c --script-chroot (SCRIPT_CHROOT) Bind <script>'s directory at /mnt inside the rootfs dir
# and chroot into the rootfs before executing <script>.
Expand Down Expand Up @@ -301,7 +300,7 @@ SCRIPT=
: ${FS_SKEL_DIR:=}
: ${KEYS_DIR:="/etc/apk/keys"}
: ${PACKAGES:=}
: ${REPOS_FILE:="/etc/apk/repositories"}
: ${REPOS_FILE:=}
: ${SCRIPT_CHROOT:="no"}
: ${TEMP_DIR:="$(mktemp -d /tmp/$PROGNAME.XXXXXX)"}
: ${TIMEZONE:=}
Expand Down

0 comments on commit d49dac3

Please sign in to comment.