diff options
| author |   Tyler Baker <tyler.baker@linaro.org> | 2017-04-04 08:40:50 -0700 |
|---|---|---|
| committer | Tyler Baker <tyler.baker@linaro.org> | 2017-04-04 08:40:50 -0700 |
| commit | ab6fb209a0fb1001bec7fc421615e70081ad978a (patch) | |
| tree | cc7b4e917d9f534ec5b144a5adfed444f6ebbb92 /Dockerfile | |
| parent | 03544166c8be8f0565b59e02f3c80c709680f24e (diff) | |
HACK: Remove hacky patch
Signed-off-by: Tyler Baker <tyler.baker@linaro.org>
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -36,9 +36,6 @@ RUN echo 'lava-server lava-server/instance-name string lava-docker-instance' | && /stop.sh \ && rm -rf /var/lib/apt/lists/* -# Add patches -COPY hack.patch /root/ - # 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 \ @@ -52,7 +49,6 @@ RUN /start.sh \ && git clone -b master https://git.linaro.org/lava/lava-server.git /root/lava-server \ && cd /root/lava-server \ && git checkout 2017.2 \ - && git am /root/hack.patch \ && git fetch https://review.linaro.org/lava/lava-server refs/changes/28/18328/1 && git cherry-pick FETCH_HEAD \ && echo "cd \${DIR} && dpkg -i *.deb" >> /root/lava-server/share/debian-dev-build.sh \ && cd /root/lava-dispatcher && /root/lava-server/share/debian-dev-build.sh -p lava-dispatcher \ |