Docker: change ivre/db to mongo (#1529)

doc/install/docker.rst

@@ -55,9 +55,9 @@ data):
 
 ::
 
-   $ mkdir -m 1777 var_{lib,log}_mongodb ivre-share dokuwiki_data
+   $ mkdir -m 1777 var_lib_mongodb ivre-share dokuwiki_data
      # For people using SELinux enforced, you need to run
-   $ sudo chcon -Rt svirt_sandbox_file_t var_{lib,log}_mongodb ivre-share dokuwiki_data
+   $ sudo chcon -Rt svirt_sandbox_file_t var_lib_mongodb ivre-share dokuwiki_data
 
    $ cp [path to ivre source]/docker/Vagrantfile .
    $ vagrant up --no-parallel
@@ -79,7 +79,7 @@ that, from the ``docker/`` directory, run:
 
    $ docker pull debian:stable
    $ docker pull debian:buster
-   $ for img in base client agent db web web-doku web-uwsgi ; do
+   $ for img in base client agent web web-doku web-uwsgi ; do
    > docker build -t "ivre/$img" "$img"
    > done
 

docker/Vagrantfile

@@ -21,12 +21,12 @@
 #
 # Create the directories to store the logs and data:
 #
-# $ mkdir -m 1777 var_{lib,log}_mongodb ivre-share dokuwiki_data
+# $ mkdir -m 1777 var_lib_mongodb ivre-share dokuwiki_data
 #
 #
 # If you have SELinux enforced, run:
 #
-# $ sudo chcon -Rt svirt_sandbox_file_t var_{lib,log}_mongodb ivre-share dokuwiki_data
+# $ sudo chcon -Rt svirt_sandbox_file_t var_lib_mongodb ivre-share dokuwiki_data
 #
 #
 # Then start the containers with:
@@ -48,11 +48,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # The DB server
   config.vm.define 'ivredb' do |db|
     db.vm.provider "docker" do |docker|
-      docker.image = 'ivre/db'
+      docker.image = 'mongo'
       docker.name = 'ivredb'
     end
-    db.vm.synced_folder "var_lib_mongodb", "/var/lib/mongodb"
-    db.vm.synced_folder "var_log_mongodb", "/var/log/mongodb"
+    db.vm.synced_folder "var_lib_mongodb", "/data/db"
   end
 
   # The PHP Dokuwiki server

docker/docker-compose.yml

@@ -17,11 +17,10 @@
 version: '3'
 services:
   ivredb:
-    image: ivre/db
+    image: mongo
     container_name: ivredb
     volumes:
-      - ./var_lib_mongodb:/var/lib/mongodb
-      - ./var_log_mongodb:/var/log/mongodb
+      - ./var_lib_mongodb:/data/db
     restart: always
   ivreuwsgi:
     image: ivre/web-uwsgi

pkg/builddockers

@@ -54,12 +54,12 @@ cd "$(dirname "$0")/../docker" || exit 255
 
 docker build --no-cache -t "ivre/base:$tag" "base-local" || exit $?
 
-for img in client agent db web web-doku web-uwsgi ; do
+for img in client agent web web-doku web-uwsgi ; do
     docker build --no-cache --build-arg TAG="$tag" -t "ivre/$img:$tag" "$img" || exit $?
 done
 
 # Uncomment to push images
 # docker login
-# for img in base client agent db web web-doku web-uwsgi ; do
+# for img in base client agent web web-doku web-uwsgi ; do
 #     docker push "ivre/$img:$tag"
 # done

setup.py

@@ -219,7 +219,6 @@ def _write_pkg_file(self, file):
         ("share/ivre/docker/agent", ["docker/agent/Dockerfile"]),
         ("share/ivre/docker/base", ["docker/base/Dockerfile"]),
         ("share/ivre/docker/client", ["docker/client/Dockerfile"]),
-        ("share/ivre/docker/db", ["docker/db/Dockerfile"]),
         (
             "share/ivre/docker/web",
             ["docker/web/Dockerfile", "docker/web/nginx-default-site"],

web/static/doc/_sources/install/docker.rst.txt

@@ -55,9 +55,9 @@ data):
 
 ::
 
-   $ mkdir -m 1777 var_{lib,log}_mongodb ivre-share dokuwiki_data
+   $ mkdir -m 1777 var_lib_mongodb ivre-share dokuwiki_data
      # For people using SELinux enforced, you need to run
-   $ sudo chcon -Rt svirt_sandbox_file_t var_{lib,log}_mongodb ivre-share dokuwiki_data
+   $ sudo chcon -Rt svirt_sandbox_file_t var_lib_mongodb ivre-share dokuwiki_data
 
    $ cp [path to ivre source]/docker/Vagrantfile .
    $ vagrant up --no-parallel
@@ -79,7 +79,7 @@ that, from the ``docker/`` directory, run:
 
    $ docker pull debian:stable
    $ docker pull debian:buster
-   $ for img in base client agent db web web-doku web-uwsgi ; do
+   $ for img in base client agent web web-doku web-uwsgi ; do
    > docker build -t "ivre/$img" "$img"
    > done
 

web/static/doc/install/docker.html

@@ -146,9 +146,9 @@ <h2>Using Vagrant<a class="headerlink" href="#using-vagrant" title="Permalink to
 source tree (or the <code class="docutils literal notranslate"><span class="pre">[PREFIX]/share/ivre/docker/</span></code> directory when IVRE
 has been installed), run (from the folder where you want to store your
 data):</p>
-<div class="highlight-default notranslate"><div class="highlight"><pre><span></span>$ mkdir -m 1777 var_{lib,log}_mongodb ivre-share dokuwiki_data
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span>$ mkdir -m 1777 var_lib_mongodb ivre-share dokuwiki_data
   # For people using SELinux enforced, you need to run
-$ sudo chcon -Rt svirt_sandbox_file_t var_{lib,log}_mongodb ivre-share dokuwiki_data
+$ sudo chcon -Rt svirt_sandbox_file_t var_lib_mongodb ivre-share dokuwiki_data
 
 $ cp [path to ivre source]/docker/Vagrantfile .
 $ vagrant up --no-parallel
@@ -165,7 +165,7 @@ <h2>Build the images<a class="headerlink" href="#build-the-images" title="Permal
 that, from the <code class="docutils literal notranslate"><span class="pre">docker/</span></code> directory, run:</p>
 <div class="highlight-default notranslate"><div class="highlight"><pre><span></span>$ docker pull debian:stable
 $ docker pull debian:buster
-$ for img in base client agent db web web-doku web-uwsgi ; do
+$ for img in base client agent web web-doku web-uwsgi ; do
 &gt; docker build -t &quot;ivre/$img&quot; &quot;$img&quot;
 &gt; done
 </pre></div>