diff options
| author | Lukas Larsson <lukas@erlang.org> | 2022-03-25 09:43:59 +0100 |
|---|---|---|
| committer | Lukas Larsson <lukas@erlang.org> | 2022-03-25 09:43:59 +0100 |
| commit | 23649dc2a882f4adbd4d92c7b23dbb399429f317 (patch) | |
| tree | 44b986591d2b08ea431bfe5b4da3b930c16cde0a | |
| parent | 1122794b179cbd94ad250e619086e6e2f109fadd (diff) | |
| download | erlang-23649dc2a882f4adbd4d92c7b23dbb399429f317.tar.gz | |
gh: Fix base docker image to work with gitpod
| -rw-r--r-- | .github/dockerfiles/Dockerfile.ubuntu-base | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/.github/dockerfiles/Dockerfile.ubuntu-base b/.github/dockerfiles/Dockerfile.ubuntu-base index 662265bc01..045d0352eb 100644 --- a/.github/dockerfiles/Dockerfile.ubuntu-base +++ b/.github/dockerfiles/Dockerfile.ubuntu-base @@ -8,6 +8,8 @@ ENV INSTALL_LIBS="zlib1g-dev libncurses5-dev libssl-dev unixodbc-dev libsctp-dev ARG EXTRA_LIBS="erlang erlang-doc" +USER root + ENV DEBIAN_FRONTEND=noninteractive ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 @@ -15,14 +17,16 @@ RUN apt-get update && apt-get -y upgrade && \ apt-get install -y build-essential m4 autoconf fop xsltproc \ default-jdk libxml2-utils flex \ unixodbc odbc-postgresql postgresql \ - tzdata ssh openssh-server groff-base sudo gdb apache2 bind9 nsd expect vsftpd python \ + tzdata ssh openssh-server groff-base sudo gdb bind9 nsd expect vsftpd python \ linux-tools-common linux-tools-generic linux-tools-`uname -r` \ ${INSTALL_LIBS} && \ for lib in ${EXTRA_LIBS}; do apt-get install -y ${lib}; done && \ + if [ ! -f /etc/apache2/apache2.conf ]; then apt-get install -y apache2; fi && \ sed -i 's@# en_US.UTF-8@en_US.UTF-8@g' /etc/locale.gen && locale-gen && \ update-alternatives --set wx-config /usr/lib/x86_64-linux-gnu/wx/config/gtk3-unicode-3.0 ## EXTRA_LIBS are installed using a for loop because of bugs in the erlang-doc deb package +## Apache2 may already be installed, if so we do not want to install it again ENV LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 |