fix(docker): fix missing submodules inside docker-compose

Author: Francesco Sardone

.circleci/config.yml

@@ -58,11 +58,11 @@ jobs:
 
       - run:
           name: "Install Git"
-          command: "apk add git"
+          command: "sh ./scripts/git.sh $BLOG_BUILD_ENV"
 
       - run:
           name: "Update Git Submodules"
-          command: "git submodule update --init --recursive"
+          command: "sh ./scripts/submodules.sh $BLOG_BUILD_ENV"
 
       - run:
           name: "Install Hugo"

.docker/blog.Dockerfile

@@ -6,16 +6,18 @@ ENV BLOG_PORT=25001
 ENV BLOG_INTERFACE=0.0.0.0
 
 ARG BLOG_DIR=app
+ARG BLOG_BUILD_ENV=docker
 
-RUN apk update
-RUN apk add hugo
+RUN apk update && apk add hugo && mkdir ${BLOG_DIR}
 
-RUN mkdir ${BLOG_DIR}
 WORKDIR /${BLOG_DIR}
 
 COPY . .
 
-ENTRYPOINT ["./docker-entrypoint.sh"]
+RUN sh ./scripts/git.sh ${BLOG_BUILD_ENV} && sh ./scripts/submodules.sh ${BLOG_BUILD_ENV}
+
+ENTRYPOINT ["./scripts/docker-entrypoint.sh"]
+
 CMD ["hugo"]
 
-EXPOSE ${BLOG_PORT}
+EXPOSE ${BLOG_PORT}

README.md

@@ -16,7 +16,7 @@ In order to the use correct version of Hugo it is **recommended** to use Docker.
 
 2. Update git submodules:
     ```bash
-    git submodule update --init --recursive
+    sh init.sh
     ```
 
 ### 🐳 Containerized Environment

docker-compose.yml

@@ -21,4 +21,7 @@ services:
 
     build:
       context: .
-      dockerfile: ".docker/blog.Dockerfile"
+      dockerfile: ".docker/blog.Dockerfile"
+
+      args:
+        BLOG_BUILD_ENV: compose

init.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+sh ./scripts/submodules.sh "local"

docker-entrypoint.sh renamed to scripts/docker-entrypoint.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+if [ ! "$1" = "compose" ]; then
+  apk add git
+fi

scripts/git.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+if [ ! "$1" = "compose" ]; then
+  git submodule update --init --recursive
+fi