Merge branch 'new' of git.data.coop:data.coop/website into smaller-margins

Dockerfile_hugo

@@ -1,6 +1,7 @@
 FROM debian:buster-slim
+
 RUN apt-get update && \
     apt-get upgrade -y && \
-    apt-get install -y wget && \
+    apt-get install -y wget git && \
     wget https://github.com/gohugoio/hugo/releases/download/v0.80.0/hugo_extended_0.80.0_Linux-64bit.deb -O hugo.deb && \
     dpkg -i hugo.deb

config.yaml

@@ -5,8 +5,7 @@ copyright: CC-BY, see https://creativecommons.org/licenses/by/4.0/
 title: data.coop
 theme: datacoop2020
 
-DefaultContentLanguage: da
+defaultContentLanguage: da
-
 enableGitInfo: true
 
 markup:
@@ -20,47 +19,44 @@ languages:
     title: data.coop
     weight: 1
     LanguageName: Dansk
-    baseURL: https://new.data.coop/
+    menu:
+      nav:
+      - name: "Bliv Medlem"
+        url: "membership/"
+        weight: 1
+      - name: "Om os"
+        url: "about/"
+        weight: 2
+      - name: "Tjenester"
+        url: "services/"
+        weight: 3
+      - name: "Vedtægter"
+        url: "rights/"
+        weight: 4
+      - name: "Opdateringer"
+        url: "updates/"
+        weight: 5
   en:
     title: data.coop
     weight: 2
     LanguageName: English
-    baseURL: https://new.data.coop/en/
     menu:
       nav:
       - name: "Membership"
-        url: "/membership/"
+        url: "en/membership/"
         weight: 1
       - name: "About us"
-        url: "/about/"
+        url: "en/about/"
         weight: 2
       - name: "Services"
-        url: "/services/"
+        url: "en/services/"
         weight: 3
       - name: "Statutes"
-        url: "/rights/"
+        url: "en/rights/"
         weight: 4
       - name: "Updates"
-        url: "/updates/"
+        url: "en/updates/"
         weight: 5
 
 params:
   description: "Et datakollektiv, der passer på dine data."
-
-menu:
-  nav:
-  - name: "Bliv Medlem"
-    url: "/membership/"
-    weight: 1
-  - name: "Om os"
-    url: "/about/"
-    weight: 2
-  - name: "Tjenester"
-    url: "/services/"
-    weight: 3
-  - name: "Vedtægter"
-    url: "/rights/"
-    weight: 4
-  - name: "Opdateringer"
-    url: "/updates/"
-    weight: 5

docker-compose.yml

@@ -1,6 +1,6 @@
 version: "3"
-services:
 
+services:
   serve:
     build: 
       context: .
@@ -10,9 +10,6 @@ services:
         cd /code
         hugo serve
       "
-    ports:
-      - "1313:1313"
     network_mode: "host"
     volumes:
       - .:/code
-