diff options
author | Corentin LABBE <clabbe@baylibre.com> | 2019-07-02 11:14:07 +0200 |
---|---|---|
committer | Corentin LABBE <clabbe@baylibre.com> | 2019-08-26 14:36:50 +0200 |
commit | 63da4cb3d258222ff1b11052951c7e5d7ca8e02c (patch) | |
tree | 2c309e475a66d2a8126549d444d3ca23aee97931 /lava-master-base/Dockerfile | |
parent | c0be09b6ddfd855eeadb3628a481f9c0bb4e26b7 (diff) |
Upgrade to 2019.07
This patch upgrade LAVA to 2019.07 via their official docker images.
Along with the change of the baseimage from our lava-xx-base to official
2019.07, some minor changes are needed:
- Activate the en_US.UTF-8 locale needed for postgresql
- chown to lavaserver all copied device-types
- Fix the start scripts for using the official entrypoints
Diffstat (limited to 'lava-master-base/Dockerfile')
-rw-r--r-- | lava-master-base/Dockerfile | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/lava-master-base/Dockerfile b/lava-master-base/Dockerfile deleted file mode 100644 index ee7d47f..0000000 --- a/lava-master-base/Dockerfile +++ /dev/null @@ -1,62 +0,0 @@ -FROM bitnami/minideb:stretch - -RUN echo "deb http://deb.debian.org/debian/ stretch-backports main" >> /etc/apt/sources.list -COPY 99-stretch-backports /etc/apt/preferences.d/ - -RUN apt-get update - -# Install debian packages used by the container -# Configure apache to run the lava server -# Log the hostname used during install for the slave name -RUN echo 'lava-server lava-server/instance-name string lava-docker-instance' | debconf-set-selections \ - && echo 'locales locales/locales_to_be_generated multiselect C.UTF-8 UTF-8, en_US.UTF-8 UTF-8 ' | debconf-set-selections \ - && echo 'locales locales/default_environment_locale select en_US.UTF-8' | debconf-set-selections - -RUN echo "APT::Install-Recommends false;" > /etc/apt/apt.conf.d/01norecommands - -# e2fsprogs is for libguestfs -RUN DEBIAN_FRONTEND=noninteractive apt-get -y install \ - locales \ - postgresql \ - screen \ - sudo \ - wget \ - e2fsprogs \ - letsencrypt \ - apt-transport-https \ - gnupg \ - vim - -RUN wget https://apt.lavasoftware.org/lavasoftware.key.asc \ - && apt-key add lavasoftware.key.asc \ - && echo 'deb https://apt.lavasoftware.org/release stretch-backports main' > /etc/apt/sources.list.d/lava.list \ - && apt-get clean && apt-get update && apt-get -y upgrade - -RUN service postgresql start \ - && DEBIAN_FRONTEND=noninteractive apt-get -y install lava lava-server \ - && sudo -u postgres psql lavaserver -c "DELETE FROM lava_scheduler_app_worker WHERE lava_scheduler_app_worker.hostname = 'example.com';" \ - && service postgresql stop - -RUN a2enmod proxy \ - && a2enmod proxy_http \ - && a2dissite 000-default \ - && a2ensite lava-server - -# Add services helper utilities to start and stop LAVA -COPY scripts/stop.sh . -COPY scripts/start.sh . -COPY scripts/lava-logs /etc/init.d/ -RUN chmod 755 /etc/init.d/lava-logs -COPY scripts/lava-master /etc/init.d/ -RUN chmod 755 /etc/init.d/lava-master -COPY scripts/lava-slave /etc/init.d/ -RUN chmod 755 /etc/init.d/lava-slave -COPY scripts/lava-server-gunicorn /etc/init.d/ -RUN chmod 755 /etc/init.d/lava-server-gunicorn - -RUN dpkg -l | grep lava -RUN dpkg -l | grep lava | sed 's,[[:space:]][[:space:]]*, ,g' | cut -d' ' -f3 | tr '+~' _ - -EXPOSE 80 3079 5555 5556 - -CMD /start.sh && while [ true ];do sleep 365d; done |