Re-apply PR 2794

zoncrd · Aug 15, 2021 · e4032f4 · e4032f4
1 parent 79ec6a5
commit e4032f4
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -124,10 +124,10 @@ Without `docker-compose` the container creation could be tedious and repetitive,
 
 ```bash
 $ sudo docker run -d \
-  -v ~/mycroft-config:/home/mycroft/.mycroft \
+  -v ~/mycroft-config:/home/mycroft/.config/mycroft \
   -v ~/mycroft-web-cache:/var/tmp \
   -v mycroft_ipc:/tmp/mycroft/ipc \
-  -v mycroft_skills_config:/home/mycroft/.config/mycroft \
+  -v mycroft_skills_config:/home/mycroft/.local/share/mycroft/skills \
   -v mycroft_skills:/opt/mycroft/skills \
   -v mycroft_skills_venv:/opt/mycroft-venv \
   -v mycroft_skills_repo:/opt/mycroft \

diff --git a/audio/Dockerfile b/audio/Dockerfile
@@ -7,7 +7,7 @@ LABEL vendor=Smartgic.io \
   io.smartgic.is-beta="no" \
   io.smartgic.is-production="no" \
   io.smartgic.version="${TAG}" \
-  io.smartgic.release-date="2021-01-01"
+  io.smartgic.release-date="2021-08-15"
 
 WORKDIR /home/mycroft/core
 

diff --git a/base/Dockerfile b/base/Dockerfile
@@ -8,7 +8,7 @@ LABEL vendor=Smartgic.io \
   io.smartgic.is-beta="no" \
   io.smartgic.is-production="no" \
   io.smartgic.version="${TAG}" \
-  io.smartgic.release-date="2021-01-02"
+  io.smartgic.release-date="2021-08-15"
 
 ENV TERM linux
 ENV DEBIAN_FRONTEND noninteractive
@@ -38,4 +38,4 @@ RUN git clone https://github.com/MycroftAI/mycroft-core.git \
   pip3 install -r ${MYCROFT_DIR}/requirements/requirements.txt && \
   echo "${MYCROFT_DIR}" > ${VIRTUAL_ENV}/lib/python$(eval ${PYTHON_VERSION})/site-packages/mycroft.pth && \
   rm -rf ${HOME}/.cache && \
-  mkdir -p /tmp/mycroft/ipc /home/mycroft/.mycroft /tmp/mycroft/cache
+  mkdir -p /tmp/mycroft/ipc /home/mycroft/.config/mycroft /tmp/mycroft/cache
diff --git a/bus/Dockerfile b/bus/Dockerfile
@@ -7,7 +7,7 @@ LABEL vendor=Smartgic.io \
       io.smartgic.is-beta="no" \
       io.smartgic.is-production="no" \
       io.smartgic.version="${TAG}" \
-      io.smartgic.release-date="2021-01-01"
+      io.smartgic.release-date="2021-08-15"
 
 WORKDIR /home/mycroft/core
 

diff --git a/cli/Dockerfile b/cli/Dockerfile
@@ -7,7 +7,7 @@ LABEL vendor=Smartgic.io \
     io.smartgic.is-beta="no" \
     io.smartgic.is-production="no" \
     io.smartgic.version="${TAG}" \
-    io.smartgic.release-date="2021-01-01"
+    io.smartgic.release-date="2021-08-15"
 
 WORKDIR /home/mycroft/core
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -29,7 +29,7 @@ services:
     image: smartgic/mycroft-bus:${VERSION}
     network_mode: host
     volumes:
-      - ~/mycroft-config:/home/mycroft/.mycroft
+      - ~/mycroft-config:/home/mycroft/.config/mycroft
       - mycroft_ipc:/tmp/mycroft/ipc
 
   mycroft_enclosure:
@@ -39,7 +39,7 @@ services:
     image: smartgic/mycroft-enclosure:${VERSION}
     network_mode: host
     volumes:
-      - ~/mycroft-config:/home/mycroft/.mycroft
+      - ~/mycroft-config:/home/mycroft/.config/mycroft
       - mycroft_ipc:/tmp/mycroft/ipc
     depends_on:
       - mycroft_bus
@@ -51,7 +51,7 @@ services:
     image: smartgic/mycroft-cli:${VERSION}
     network_mode: host
     volumes:
-      - ~/mycroft-config:/home/mycroft/.mycroft
+      - ~/mycroft-config:/home/mycroft/.config/mycroft
       - mycroft_ipc:/tmp/mycroft/ipc
       - mycroft_skills_venv:/opt/mycroft-venv
       - mycroft_skills_repo:/opt/mycroft
@@ -71,7 +71,7 @@ services:
       PULSE_SERVER: unix:${XDG_RUNTIME_DIR}/pulse/native
       PULSE_COOKIE: /home/mycroft/.config/pulse/cookie
     volumes:
-      - ~/mycroft-config:/home/mycroft/.mycroft
+      - ~/mycroft-config:/home/mycroft/.config/mycroft
       - mycroft_ipc:/tmp/mycroft/ipc
       - mycroft_cache:/tmp/mycroft/cache
       - ~/.config/pulse/cookie:/home/mycroft/.config/pulse/cookie:ro
@@ -91,7 +91,7 @@ services:
       PULSE_SERVER: unix:${XDG_RUNTIME_DIR}/pulse/native
       PULSE_COOKIE: /home/mycroft/.config/pulse/cookie
     volumes:
-      - ~/mycroft-config:/home/mycroft/.mycroft
+      - ~/mycroft-config:/home/mycroft/.config/mycroft
       - ~/mycroft-web-cache:/var/tmp
       - ~/.config/pulse/cookie:/home/mycroft/.config/pulse/cookie:ro
       - ${XDG_RUNTIME_DIR}/pulse:${XDG_RUNTIME_DIR}/pulse:ro
@@ -114,14 +114,14 @@ services:
       PULSE_COOKIE: /home/mycroft/.config/pulse/cookie
       CRYPTOGRAPHY_DONT_BUILD_RUST: 1
     volumes:
-      - ~/mycroft-config:/home/mycroft/.mycroft
+      - ~/mycroft-config:/home/mycroft/.config/mycroft
       - ~/mycroft-web-cache:/var/tmp
       - ~/.config/pulse/cookie:/home/mycroft/.config/pulse/cookie:ro
       - ${XDG_RUNTIME_DIR}/pulse:${XDG_RUNTIME_DIR}/pulse:ro
       - mycroft_ipc:/tmp/mycroft/ipc
       - mycroft_cache:/tmp/mycroft/cache
       - mycroft_skills_venv:/opt/mycroft-venv
-      - mycroft_skills_config:/home/mycroft/.config/mycroft
+      - mycroft_skills_config:/home/mycroft/.local/share/mycroft/skills
       - mycroft_skills_repo:/opt/mycroft
       - mycroft_skills:/opt/mycroft/skills
       - /sys:/sys:ro

diff --git a/enclosure/Dockerfile b/enclosure/Dockerfile
@@ -7,7 +7,7 @@ LABEL vendor=Smartgic.io \
       io.smartgic.is-beta="no" \
       io.smartgic.is-production="no" \
       io.smartgic.version="${TAG}" \
-      io.smartgic.release-date="2021-01-01"
+      io.smartgic.release-date="2021-08-15"
 
 WORKDIR /home/mycroft/core
 

diff --git a/skills/Dockerfile b/skills/Dockerfile
@@ -7,7 +7,7 @@ LABEL vendor=Smartgic.io \
     io.smartgic.is-beta="no" \
     io.smartgic.is-production="no" \
     io.smartgic.version="${TAG}" \
-    io.smartgic.release-date="2021-01-01"
+    io.smartgic.release-date="2021-08-15"
 
 WORKDIR /home/mycroft/core
 

diff --git a/voice/Dockerfile b/voice/Dockerfile
@@ -7,7 +7,7 @@ LABEL vendor=Smartgic.io \
     io.smartgic.is-beta="no" \
     io.smartgic.is-production="no" \
     io.smartgic.version="${TAG}" \
-    io.smartgic.release-date="2021-01-01"
+    io.smartgic.release-date="2021-08-15"
 
 ENV DEBIAN_FRONTEND noninteractive