Skip to content
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

Fix Dockerfile #67

Merged
merged 6 commits into from
Feb 9, 2019
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ENV GUID=1000

ENV LANG=pt_BR.UTF-8

RUN apt-get update &&
RUN apt-get update && \
apt-get install -y --no-install-recommends \
locales \
ca-certificates \
Expand Down Expand Up @@ -41,11 +41,11 @@ RUN apt-get update &&
xauth \
zenity \
# Setup locale
&& echo "pt_BR.UTF-8 UTF-8" > /etc/locales.gen \
&& locale-gen
&& echo "pt_BR.UTF-8 UTF-8" > /etc/locale.gen \
&& locale-gen \
# Downloading warsaw
&& mkdir -p /src \
&& wget https://cloud.gastecnologia.com.br/gas/diagnostico/warsaw_setup_64.deb -O /src/GBPCEFwr64.deb
&& wget https://cloud.gastecnologia.com.br/gas/diagnostico/warsaw_setup_64.deb -O /src/GBPCEFwr64.deb \
# Configuring the environment
&& mkdir -p /home/${USER} \
&& groupadd -g ${GUID} -r ${USER} \
Expand All @@ -67,7 +67,7 @@ USER ff
VOLUME "/home/ff/Downloads"

COPY startup.sh /home/ff/
RUN chmod 744 /home/ff/startup.sh \
RUN sudo chmod 777 /home/ff/startup.sh
farribeiro marked this conversation as resolved.
Show resolved Hide resolved

# Autorun Firefox
CMD [ "/home/ff/startup.sh" ]
CMD /home/ff/startup.sh
farribeiro marked this conversation as resolved.
Show resolved Hide resolved
7 changes: 5 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@ services:
- DISPLAY=${DISPLAY}
- XAUTHORITY=/home/ff/.Xauthority
- HOST_HOSTNAME=${HOSTNAME}
cpuset: '0'
mem_limit: 512M
deploy:
resources:
limits:
cpus: '0.50'
memory: 512M
farribeiro marked this conversation as resolved.
Show resolved Hide resolved
shm_size: 2g
volumes:
- /dev/shm:/dev/shm
Expand Down
4 changes: 1 addition & 3 deletions startup.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/bin/bash

export LANG="pt_BR.UTF-8"

if [ -n "${XAUTHORITY}" ] && [ -n "${HOST_HOSTNAME}" ]
then
if [ "${HOSTNAME}" != "${HOST_HOSTNAME}" ]
Expand All @@ -26,4 +24,4 @@ else
fi

/usr/local/bin/warsaw/core \
&& firefox -no-remote -private-window www.caixa.gov.br
&& firefox -no-remote -private-window --class CaixaEconomica --name CaixaEconomica https://www.caixa.gov.br