mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-11-29 06:21:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #776 from dm0-/docker

Browse Source 
build_torcx_store: Update the default Docker to 17.11
This commit is contained in:
David Michael 2017-11-30 22:44:18 -05:00 committed by GitHub
commit 7ab2b63f09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build_torcx_store
View File

@ -145,6 +145,7 @@ function torcx_package() {
sudo find "${tmproot}/lib/systemd/system" -type f -exec sed -i \ sudo find "${tmproot}/lib/systemd/system" -type f -exec sed -i \
-e '/^\[Unit]/aRequires=torcx.target\nAfter=torcx.target' \ -e '/^\[Unit]/aRequires=torcx.target\nAfter=torcx.target' \
-e '/^\[Service]/aEnvironmentFile=/run/metadata/torcx' \ -e '/^\[Service]/aEnvironmentFile=/run/metadata/torcx' \
-e "/^\[Service]/aEnvironment=TORCX_IMAGEDIR=/${name}" \
-e 's,/usr/s\?bin/,${TORCX_BINDIR}/,g' \ -e 's,/usr/s\?bin/,${TORCX_BINDIR}/,g' \
-e 's,^\([^ ]*=\)\(.{TORCX_BINDIR}\)/,\1/usr/bin/env PATH=\2:${PATH} \2/,' {} + -e 's,^\([^ ]*=\)\(.{TORCX_BINDIR}\)/,\1/usr/bin/env PATH=\2:${PATH} \2/,' {} +
fi fi
@ -167,8 +168,13 @@ function torcx_package() {
: # Set $? to 0 or the pipeline fails and -e quits. : # Set $? to 0 or the pipeline fails and -e quits.
done done
# Move anything we plan to package to its root # Move anything we plan to package to its root.
sudo mv "${tmproot}"/{.torcx,bin,lib} "${tmppkgroot}" sudo mv "${tmproot}"/{.torcx,bin,lib} "${tmppkgroot}"
if [ -e "${tmproot}/usr/share" ]
then
sudo mkdir "${tmppkgroot}/usr"
sudo mv "${tmproot}/usr/share" "${tmppkgroot}/usr/"
fi
tmpfile="${BUILD_DIR}/${name}:${version}.torcx.tgz" tmpfile="${BUILD_DIR}/${name}:${version}.torcx.tgz"
tar --force-local -C "${tmppkgroot}" -czf "${tmpfile}" . tar --force-local -C "${tmppkgroot}" -czf "${tmpfile}" .
@ -219,7 +225,7 @@ function torcx_package() {
# swapping default package versions for different OS releases by reordering. # swapping default package versions for different OS releases by reordering.
DEFAULT_IMAGES=( DEFAULT_IMAGES=(
=app-torcx/docker-1.12 =app-torcx/docker-1.12
=app-torcx/docker-17.10 =app-torcx/docker-17.11
) )
# This list contains extra images which will be uploaded and included in the # This list contains extra images which will be uploaded and included in the