From 3842fb16dad9e6883baebc6a0567a0a0b3a365a2 Mon Sep 17 00:00:00 2001 From: Cody Hiar Date: Tue, 19 Feb 2019 12:23:16 -0700 Subject: Minor tweaks --- Dockerfile | 13 ++----------- docker-compose.yml | 3 ++- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index c8057d6..aac248e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,8 +13,7 @@ RUN apt-get update && apt-get install -y \ libasound2 \ libgl1-mesa-glx \ libpulse0 \ - dbus-x11 \ - sudo + dbus-x11 RUN /bin/bash @@ -22,21 +21,13 @@ ENV UNAME thorny ENV UID 1000 ENV GID 985 - -# # Set up the user +# Set up the user RUN export UNAME=$UNAME UID=$UID GID=1000 && \ mkdir -p "/home/${UNAME}" && \ echo "${UNAME}:x:${UID}:${GID}:${UNAME} User,,,:/home/${UNAME}:/bin/bash" >> /etc/passwd && \ echo "${UNAME}:x:${UID}:" >> /etc/group -RUN chown thorny:thorny /home/thorny -# echo "${UNAME} ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/${UNAME} && \ -# chmod 0440 /etc/sudoers.d/${UNAME} && \ -# chown ${UID}:${GID} -R /home/${UNAME} && \ -# gpasswd -a ${UNAME} audio - -USER $UNAME ENV HOME /home/thorny WORKDIR /home/thorny CMD /bin/bash diff --git a/docker-compose.yml b/docker-compose.yml index cc7dae7..2304fe1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: build: context: ./ dockerfile: ./Dockerfile - network_mode: "bridge" + network_mode: "host" container_name: firefox image: thornycrackers/firefox environment: @@ -17,6 +17,7 @@ services: - /tmp/pulseaudio.client.conf:/etc/pulse/client.conf - /etc/localtime:/etc/localtime:ro - ./data:/home/thorny/.mozilla + - /home/thorny/Downloads:/home/thorny/Downloads command: /bin/bash firefox tty: true stdin_open: true -- cgit v1.2.3