Skip to content

Commit

Permalink
Merge pull request freeciv#234 from dlshcbmuipmam/develop
Browse files Browse the repository at this point in the history
Fixed Docker build issues
  • Loading branch information
lonemadmax authored Jan 28, 2019
2 parents ffcad84 + 231daad commit 3e553f9
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,25 @@ ADD tests /docker/tests
ADD music /docker/music
ADD blender /docker/blender
ADD nginx /docker/nginx
ADD config /docker/config

## Install relevant packages

RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get -y upgrade && apt-get install -y sudo lsb-release
RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get -y upgrade && apt-get install -y \
sudo \
lsb-release \
locales

EXPOSE 80 8080 4002 6000 6001 6002 7000 7001 7002

## Fix locate issues

RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
dpkg-reconfigure --frontend=noninteractive locales && \
update-locale LANG=en_US.UTF-8

ENV LANG en_US.UTF-8

## Create user and ensure no passwd questions during scripts

RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
Expand Down

0 comments on commit 3e553f9

Please sign in to comment.