-
Notifications
You must be signed in to change notification settings - Fork 42
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
docker build support #413
Open
lrvick
wants to merge
7
commits into
fosslinux:master
Choose a base branch
from
lrvick:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
docker build support #413
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
7cfeddf
initial docker build support
lrvick 4ebd0b6
external sources arg
fosslinux fc6eeb6
deterministic docker support
lrvick 7b1a775
Merge remote-tracking branch 'upstream/master'
lrvick fc1dcac
use long options for docker
lrvick 2408b8e
License headers
lrvick 87c6fcc
Merge remote-tracking branch 'upstream/master'
lrvick File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,8 +16,58 @@ mount | grep '/sys' &> /dev/null || (mkdir -p /sys; mount -t sysfs sysfs /sys) | |
mount | grep '/tmp' &> /dev/null || (mkdir -p /tmp; mount -t tmpfs tmpfs /tmp) | ||
mount | grep '/dev/shm' &> /dev/null || (mkdir -p /dev/shm; mount -t tmpfs tmpfs /dev/shm) | ||
|
||
if [ "${EXTERNAL_SOURCES}" = "False" ]; then | ||
# Add /etc/resolv.conf | ||
if [ "${CHROOT}" = False ]; then | ||
rm /etc/mtab | ||
ln -s /proc/mounts /etc/mtab | ||
fi | ||
|
||
# Add /etc/resolv.conf | ||
if [ ! -e "/etc/resolv.conf" ]; then | ||
echo 'nameserver 1.1.1.1' > /etc/resolv.conf | ||
fi | ||
if [ ! -e "/etc/resolv.conf/head" ]; then | ||
echo 'nameserver 1.1.1.1' > /etc/resolv.conf.head | ||
fi | ||
|
||
# /etc/passwd -- taken from LFS | ||
if [ ! -e "/etc/passwd" ]; then | ||
cat > /etc/passwd << "EOF" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Won't this conflict with later steps? |
||
root:x:0:0:root:/root:/bin/bash | ||
bin:x:1:1:bin:/dev/null:/usr/bin/false | ||
daemon:x:6:6:Daemon User:/dev/null:/usr/bin/false | ||
messagebus:x:18:18:D-Bus Message Daemon User:/run/dbus:/usr/bin/false | ||
uuidd:x:80:80:UUID Generation Daemon User:/dev/null:/usr/bin/false | ||
nobody:x:65534:65534:Unprivileged User:/dev/null:/usr/bin/false | ||
EOF | ||
fi | ||
|
||
# /etc/group -- taken from LFS | ||
if [ ! -e "/etc/group" ]; then | ||
cat > /etc/group << "EOF" | ||
root:x:0: | ||
bin:x:1:daemon | ||
sys:x:2: | ||
kmem:x:3: | ||
tape:x:4: | ||
tty:x:5: | ||
daemon:x:6: | ||
floppy:x:7: | ||
disk:x:8: | ||
lp:x:9: | ||
dialout:x:10: | ||
audio:x:11: | ||
video:x:12: | ||
utmp:x:13: | ||
usb:x:14: | ||
cdrom:x:15: | ||
adm:x:16: | ||
messagebus:x:18: | ||
input:x:24: | ||
mail:x:34: | ||
kvm:x:61: | ||
uuidd:x:80: | ||
wheel:x:97: | ||
users:x:999: | ||
nogroup:x:65534: | ||
EOF | ||
fi |
Oops, something went wrong.
You are viewing a condensed version of this merge commit. You can view the full changes here.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
typo: resolv.conf.head