Skip to content

Release v1.9.2-rc1 #76

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.

Sign up for GitHub

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

Merged
olljanat merged 2 commits into from
Apr 11, 2021
Merged

Release v1.9.2-rc1 #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93855da
Bump up kernel to 4.14.229
olljanat Apr 9, 2021
deee748
Support user Docker userns-remap (#63)
olljanat Feb 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile.dapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ ARG DISTRIB_ID=BurmillaOS

ARG SELINUX_POLICY_URL=https://github.com/burmilla/refpolicy/releases/download/v0.0.3/policy.29

ARG KERNEL_VERSION=4.14.218-burmilla
ARG KERNEL_VERSION=4.14.229-burmilla
ARG KERNEL_URL_amd64=https://github.com/burmilla/os-kernel/releases/download/v${KERNEL_VERSION}/linux-${KERNEL_VERSION}-x86.tar.gz
ARG KERNEL_URL_arm64=https://github.com/burmilla/os-kernel/releases/download/v${KERNEL_VERSION}/linux-${KERNEL_VERSION}-arm64.tar.gz

Expand Down
5 changes: 5 additions & 0 deletions config/docker_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ func (d *DockerConfig) FullArgs() []string {
if d.TLS {
args = append(args, d.TLSArgs...)
}

if d.UserNsEnabled {
args = append(args, "--userns-remap")
args = append(args, "user-docker:user-docker")
}
return args
}

Expand Down
1 change: 1 addition & 0 deletions config/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ var schema = `{
"selinux_enabled": {"type": ["boolean", "null"]},
"storage_driver": {"type": "string"},
"userland_proxy": {"type": ["boolean", "null"]},
"userns_enabled": {"type": ["boolean", "null"]},
"insecure_registry": {"$ref": "#/definitions/list_of_strings"}
}
},
Expand Down
1 change: 1 addition & 0 deletions config/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ type DockerConfig struct {
CAKey string `yaml:"ca_key,omitempty"`
Environment []string `yaml:"environment,omitempty"`
StorageContext string `yaml:"storage_context,omitempty"`
UserNsEnabled bool `yaml:"userns_enabled,omitempty"`
Exec bool `yaml:"exec,omitempty"`
}

Expand Down
7 changes: 6 additions & 1 deletion images/01-base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,12 @@ RUN rm /sbin/poweroff /sbin/reboot /sbin/halt && \
rm -f /usr/share/bash-completion/completions/* && \
chmod 555 /lib/dhcpcd/dhcpcd-run-hooks && \
sed -i 1,10d /etc/rsyslog.conf && \
echo "*.* /var/log/syslog" >> /etc/rsyslog.conf
echo "*.* /var/log/syslog" >> /etc/rsyslog.conf && \
\
addgroup -g 1200 user-docker && \
adduser -u 1200 -G user-docker -S -H user-docker && \
echo 'user-docker:100000:65536' > /etc/subuid && \
echo 'user-docker:100000:65536' > /etc/subgid
# dump kernel log to console (but after we've finished booting)
# echo "kern.* /dev/console" >> /etc/rsyslog.conf

Expand Down
7 changes: 6 additions & 1 deletion images/02-console/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,12 @@ RUN apt-get update \
&& cat /etc/ssh/sshd_config > /etc/ssh/sshd_config.tpl \
&& cat /etc/ssh/sshd_config.append.tpl >> /etc/ssh/sshd_config.tpl \
&& rm -f /etc/ssh/sshd_config.append.tpl /etc/ssh/sshd_config \
&& echo > /etc/motd
&& echo > /etc/motd \
\
&& addgroup --gid 1200 user-docker \
&& adduser --system -u 1200 --gid 1200 --disabled-login --no-create-home user-docker \
&& echo 'user-docker:100000:65536' > /etc/subuid \
&& echo 'user-docker:100000:65536' > /etc/subgid

COPY build/iscsid.conf /etc/iscsi/

Expand Down
1 change: 1 addition & 0 deletions scripts/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@
"selinux_enabled": {"type": ["boolean", "null"]},
"storage_driver": {"type": "string"},
"userland_proxy": {"type": ["boolean", "null"]},
"userns_enabled": {"type": ["boolean", "null"]},
"insecure_registry": {"$ref": "#/definitions/list_of_strings"}
}
},
Expand Down