From daea3434c877151003b3988cd549a6901345d2a7 Mon Sep 17 00:00:00 2001
From: David Michael <david.michael@coreos.com>
Date: Wed, 22 Nov 2017 15:04:09 -0500
Subject: [PATCH 1/3] build_torcx_store: Update the default Docker to 17.11

---
 build_torcx_store | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_torcx_store b/build_torcx_store
index 021497f0c6..dc95c465f2 100755
--- a/build_torcx_store
+++ b/build_torcx_store
@@ -219,7 +219,7 @@ function torcx_package() {
 # swapping default package versions for different OS releases by reordering.
 DEFAULT_IMAGES=(
         =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

From 1060d9cf3b6efb737d0b37e3dd34512d298bcdc0 Mon Sep 17 00:00:00 2001
From: David Michael <david.michael@coreos.com>
Date: Thu, 30 Nov 2017 16:12:44 -0500
Subject: [PATCH 2/3] build_torcx_store: Package /usr/share in the image

---
 build_torcx_store | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/build_torcx_store b/build_torcx_store
index dc95c465f2..49ddb811a9 100755
--- a/build_torcx_store
+++ b/build_torcx_store
@@ -167,8 +167,13 @@ function torcx_package() {
                 :  # Set $? to 0 or the pipeline fails and -e quits.
         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}"
+        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"
         tar --force-local -C "${tmppkgroot}" -czf "${tmpfile}" .

From 654d8d5ad9e565b832a5f49a1055ed5e4c2f9447 Mon Sep 17 00:00:00 2001
From: David Michael <david.michael@coreos.com>
Date: Thu, 30 Nov 2017 16:14:49 -0500
Subject: [PATCH 3/3] build_torcx_store: Pass the image's unpack subdirectory
 to services

---
 build_torcx_store | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build_torcx_store b/build_torcx_store
index 49ddb811a9..5d11903771 100755
--- a/build_torcx_store
+++ b/build_torcx_store
@@ -145,6 +145,7 @@ function torcx_package() {
                 sudo find "${tmproot}/lib/systemd/system" -type f -exec sed -i \
                     -e '/^\[Unit]/aRequires=torcx.target\nAfter=torcx.target' \
                     -e '/^\[Service]/aEnvironmentFile=/run/metadata/torcx' \
+                    -e "/^\[Service]/aEnvironment=TORCX_IMAGEDIR=/${name}" \
                     -e 's,/usr/s\?bin/,${TORCX_BINDIR}/,g' \
                     -e 's,^\([^ ]*=\)\(.{TORCX_BINDIR}\)/,\1/usr/bin/env PATH=\2:${PATH} \2/,' {} +
         fi