1
0
mirror of https://github.com/stucki/docker-lineageos synced 2025-01-09 17:39:47 -05:00

Remove su-wrapper (upstream issue has been fixed)

This commit is contained in:
Michael Stucki 2016-03-13 14:54:07 +01:00
parent 14be199b1b
commit 6b6aba0a93
2 changed files with 8 additions and 13 deletions

View File

@ -34,12 +34,12 @@ RUN chmod a+x /home/cmbuild/bin/repo
# Add sudo permission # Add sudo permission
RUN echo "cmbuild ALL=NOPASSWD: ALL" > /etc/sudoers.d/cmbuild RUN echo "cmbuild ALL=NOPASSWD: ALL" > /etc/sudoers.d/cmbuild
ADD startup.sh /home/cmbuild/startup.sh
RUN chmod a+x /home/cmbuild/startup.sh
# Fix ownership # Fix ownership
RUN chown -R cmbuild:cmbuild /home/cmbuild RUN chown -R cmbuild:cmbuild /home/cmbuild
ADD startup.sh /root/startup.sh
RUN chmod a+x /root/startup.sh
# Set global variables # Set global variables
ADD android-env-vars.sh /etc/android-env-vars.sh ADD android-env-vars.sh /etc/android-env-vars.sh
RUN echo "source /etc/android-env-vars.sh" >> /etc/bash.bashrc RUN echo "source /etc/android-env-vars.sh" >> /etc/bash.bashrc
@ -47,8 +47,7 @@ RUN echo "source /etc/android-env-vars.sh" >> /etc/bash.bashrc
VOLUME /home/cmbuild/android VOLUME /home/cmbuild/android
VOLUME /srv/ccache VOLUME /srv/ccache
CMD /root/startup.sh CMD /home/cmbuild/startup.sh
# This does not work yet, see https://github.com/docker/docker/issues/9806 USER cmbuild
#USER cmbuild WORKDIR /home/cmbuild/android
#WORKDIR /home/cmbuild/android

View File

@ -16,9 +16,5 @@ for i in "/home/cmbuild/android" "/srv/ccache"; do
fi fi
done done
# Fix console permissions as long as https://github.com/docker/docker/issues/9806 is not fixed # Launch screen session
usermod --groups tty --append cmbuild screen -s /bin/bash
chgrp tty /dev/console
chmod g+rw /dev/console
su -c "cd /home/cmbuild/android; screen -s /bin/bash" cmbuild