From 031469070cc488cf100f343b77bd4ecf0e3680a2 Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Thu, 19 Oct 2017 17:12:14 +0200 Subject: Use debian stable instead of unstable Debian unstable is a too moving target for basing a docker. --- Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6ac3117..5a66526 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,6 @@ -FROM bitnami/minideb:unstable +FROM bitnami/minideb:stretch + +RUN apt-get update # Add services helper utilities to start and stop LAVA COPY scripts/stop.sh . @@ -10,7 +12,7 @@ COPY scripts/start.sh . 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 \ - && DEBIAN_FRONTEND=noninteractive install_packages \ + && DEBIAN_FRONTEND=noninteractive apt-get -y install \ locales \ postgresql \ screen \ @@ -21,9 +23,9 @@ RUN echo 'lava-server lava-server/instance-name string lava-docker-instance' | && service postgresql start \ && wget http://images.validation.linaro.org/production-repo/production-repo.key.asc \ && apt-key add production-repo.key.asc \ - && echo 'deb http://images.validation.linaro.org/production-repo/ sid main' > /etc/apt/sources.list.d/lava.list \ + && echo 'deb http://images.validation.linaro.org/production-repo/ stretch-backports main' > /etc/apt/sources.list.d/lava.list \ && apt-get clean && apt-get update \ - && DEBIAN_FRONTEND=noninteractive install_packages \ + && DEBIAN_FRONTEND=noninteractive apt-get -y install \ lava \ qemu-system \ qemu-system-arm \ -- cgit 1.2.3-korg From 7df65cb00afac966aa964cb15abf95b486480590 Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Fri, 20 Oct 2017 15:04:09 +0200 Subject: Split some actions This patch split some actions, making them more readable. --- Dockerfile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5a66526..01b189d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,20 +11,23 @@ COPY scripts/start.sh . # 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 \ - && DEBIAN_FRONTEND=noninteractive apt-get -y install \ + && echo 'locales locales/default_environment_locale select en_US.UTF-8' | debconf-set-selections + +RUN DEBIAN_FRONTEND=noninteractive apt-get -y install \ locales \ postgresql \ screen \ sudo \ wget \ gnupg \ - vim \ - && service postgresql start \ - && wget http://images.validation.linaro.org/production-repo/production-repo.key.asc \ + vim + +RUN wget http://images.validation.linaro.org/production-repo/production-repo.key.asc \ && apt-key add production-repo.key.asc \ && echo 'deb http://images.validation.linaro.org/production-repo/ stretch-backports main' > /etc/apt/sources.list.d/lava.list \ - && apt-get clean && apt-get update \ + && apt-get clean && apt-get update + +RUN service postgresql start \ && DEBIAN_FRONTEND=noninteractive apt-get -y install \ lava \ qemu-system \ -- cgit 1.2.3-korg From ee2296c94a6b84a85c52ee8e6c33ec69931bc3ff Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Fri, 20 Oct 2017 15:09:45 +0200 Subject: Use correct lava-server command to create admin user --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 01b189d..942f1f6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,7 +45,7 @@ RUN service postgresql start \ # Create a admin user (Insecure note, this creates a default user, username: admin/admin) RUN /start.sh \ - && echo "from django.contrib.auth.models import User; User.objects.create_superuser('admin', 'admin@localhost.com', 'admin')" | lava-server manage shell \ + && lava-server manage users add --passwd admin --staff --superuser --email admin@example.com admin \ && /stop.sh # Install latest -- cgit 1.2.3-korg