Move mountpoint to /root/src. Minor other tweaks.

 - Legacy-Id: 19129

Author: larseggert

docker/Dockerfile

@@ -1,53 +1,53 @@
-# This file is a docker (https://www.docker.com/what-docker) recipe, which can
-# be used to build a docker image which is ready to run a datatracker in
-# development mode.
+# This file is a Docker (https://www.docker.com/why-docker) recipe, which can
+# be used to run a datatracker in development mode.
 #
-# It is used to build an image (once you've installed docker) using a command
-# like this (assuming suitable replacement of $variables):
-#
-# $ docker build -t ietf/datatracker:latest .
+# The "build" script in this directory can be used to build a Docker image for
+# the current branch locally.
 #
 # To use a pre-built image, assuming we have a checked-out datatracker
-# repository at /home/me/src/6.8.1.dev0, you would start (again assuming you've
-# installed docker) a container from an image, as follows:
+# repository at /datatracker/6.8.1.dev0, you would start a container from an
+# image, as follows:
 #
-# $ docker run -ti -v /home/me/src/6.8.1.dev0:/root ietf/datatracker:latest
+# $ docker run -ti -v /datatracker/6.8.1.dev0:/root/src ietf/datatracker:latest
 
 FROM ubuntu:latest
 LABEL maintainer="IETF Tools Team <tools-discuss@ietf.org>"
 
 # Default django runserver port
 EXPOSE 8000
 
-# Fetch apt package information, and upgrade to latest package versions
+# Install all dependencies that are available as packages
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get -qy dist-upgrade
-
-# Install the packages we need
-RUN apt-get install -qy \
+RUN apt-get -y update && \
+    apt-get -y dist-upgrade && \
+    apt-get -y install -y \
         apache2-utils \
-        chromium-chromedriver \
+        curl \
         enscript \
         ghostscript \
+        git \
         graphviz \
         libmariadbclient-dev \
         mariadb-server \
+        npm \
         python-is-python3 \
         python3-pip \
-        yang-tools
+        yang-tools && \
+    apt-get -y clean
 
-# Get rid of installation files we don't need in the image, to reduce size
-RUN apt-get clean && rm -rf /var/lib/apt/lists/*
+# Install bower
+RUN npm install -g bower
 
-# idnits and dependencies
+# Install idnits
 ADD https://tools.ietf.org/tools/idnits/idnits /usr/local/bin/
 RUN chmod +rx /usr/local/bin/idnits
 
-# Install current datatracker dependencies
-WORKDIR /root
-COPY requirements.txt .
-RUN pip install -r requirements.txt
+# Install current datatracker python dependencies
+COPY requirements.txt /
+RUN pip install -r /requirements.txt
 
 COPY docker-init.sh /docker-init.sh
 RUN chmod +x /docker-init.sh
+
+WORKDIR /root/src
 ENTRYPOINT ["/docker-init.sh"]

docker/build

@@ -117,8 +117,8 @@ if [ "$(uname)" == "Linux" ]; then
     die "Didn't expect to run this script on Linux -- are you inside docker?"
 fi
 
-docker rmi -f $REPO:trunk || true
-docker build -t $REPO:$TAG docker/
+docker rmi -f $REPO:latest || true
+docker build --progress=plain --pull --tag $REPO:$TAG docker/
 docker tag $(docker images -q $REPO | head -n 1) $REPO:latest
 if [ -z "$LOCAL" ]; then
     docker push $REPO:latest

docker/docker-init.sh

@@ -28,7 +28,7 @@ if [ ! -d "$MYSQLDIR/ietf_utf8" ]; then
 fi
 
 echo "Setting up a default settings_local.py ..."
-cp docker/settings_local.py "$HOME/ietf/settings_local.py"
+cp docker/settings_local.py "/root/src/ietf/settings_local.py"
 
 for sub in \
     test/id \
@@ -57,20 +57,20 @@ for sub in \
     data/developers/www6/iesg \
     data/developers/www6/iesg/evaluation \
     ; do
-    dir="$HOME/$sub"
+    dir="/root/src/$sub"
     if [ ! -d "$dir"  ]; then
         echo "Creating dir $dir"
         mkdir -p "$dir";
         chown "$USER" "$dir"
     fi
 done
 
-if [ ! -f "$HOME/test/data/draft-aliases" ]; then
+if [ ! -f "/root/src/test/data/draft-aliases" ]; then
     echo "Generating draft aliases ..."
     ietf/bin/generate-draft-aliases
 fi
 
-if [ ! -f "$HOME/test/data/group-aliases" ]; then
+if [ ! -f "/root/src/test/data/group-aliases" ]; then
     echo "Generating group aliases ..."
     ietf/bin/generate-wg-aliases
 fi

docker/run

@@ -21,12 +21,11 @@ SYNOPSIS
 DESCRIPTION
 
     This is a wrapper which runs docker with suitable arguments on a
-    debian-based docker image which has been set up with the dependencies
+    docker image which has been set up with the dependencies
     needed to easily run the IETF datatracker in development mode.  By
     default, it expects to find the MySQL database files at
     $parent/data/mysql, which is mapped inside the
-    container to /var/lib/mysql, and it will set up a home directory for
-    the current user ($USER) and map it to $HOME.
+    container to /var/lib/mysql.
 
 EOF
     echo -e "OPTIONS"
@@ -109,5 +108,5 @@ echo -e "\nThe web interface for 'runserver' should appear on 127.0.0.1:$PORT\n"
 
 docker run -ti -p "$PORT:8000" \
   -v "$MYSQLDIR:/var/lib/mysql:cached" \
-  -v "$parent:/root:cached" \
+  -v "$parent:/root/src:cached" \
   "$REPO:$TAG" "$@"