Skip to content

Commit

Permalink
docker-fedora: support additional mounts
Browse files Browse the repository at this point in the history
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: projectatomic#167
Approved by: ashcrow
giuseppe authored and rh-atomic-bot committed Feb 26, 2018
1 parent aff7916 commit 5906bbe
Showing 3 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion docker-fedora/Dockerfile
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ COPY shim.sh init.sh /usr/bin/

# system container
COPY set_mounts.sh /
COPY config.json.template service.template tmpfiles.template /exports/
COPY config.json.template service.template tmpfiles.template manifest.json /exports/
COPY daemon.json /exports/hostfs/etc/docker/container-daemon.json
# https://github.com/rhatdan/oci-umount/issues/2
# Copy config if available
1 change: 1 addition & 0 deletions docker-fedora/config.json.template
Original file line number Diff line number Diff line change
@@ -367,6 +367,7 @@
"private"
]
}
$ADDTL_MOUNTS
],
"hooks": {},
"linux": {
7 changes: 7 additions & 0 deletions docker-fedora/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"version": "1.0",
"defaultValues": {
"ADDTL_MOUNTS": ""
}
}

0 comments on commit 5906bbe

Please sign in to comment.