remove submodules

Author: cbutler

.circleci/config.yml

@@ -11,7 +11,10 @@ jobs:
           key: dependency-cache-{{ checksum "yarn.lock" }}
       - run:
           name: Install Dep
-          command: yarn
+          command: |
+            set -eo pipefail
+            git clone https://github.com/redbrick/hexo-theme-icarus.git /usr/src/app/themes/redbrick-theme
+            yarn
       - save_cache:
           key: dependency-cache-{{ checksum "yarn.lock" }}
           paths:

.gitmodules

@@ -3,9 +3,4 @@ prometheus
 log stdout
 errors stdout
 minify
-git github.com/redbrick/static-site {
-  then yarn
-  path git
-}
-root git public
-on startup yarn build
+root /public

Caddyfile

@@ -6,26 +6,27 @@ ARG plugins="git,minify,prometheus"
 RUN go get -v github.com/abiosoft/parent
 RUN VERSION=${version} PLUGINS=${plugins} /bin/sh /usr/bin/builder.sh
 
-FROM node:carbon-alpine
+FROM node:carbon-alpine as static
+
+WORKDIR /usr/src/app
+VOLUME /usr/src/app/public
+
+RUN apk add --no-cache openssh-client git build-base bash libpng-dev
+ADD package.json yarn.lock _config.yml source /usr/src/app/
+RUN git clone https://github.com/redbrick/hexo-theme-icarus.git /usr/src/app/themes/redbrick-theme
+RUN yarn && yarn build
+
+FROM scratch
 
 ARG version="0.10.12"
 LABEL caddy_version="$version"
 ENV ACME_AGREE="false"
 
+COPY Caddyfile /etc/Caddyfile
 COPY --from=builder /install/caddy /usr/bin/caddy
 COPY --from=builder /go/bin/parent /bin/parent
+COPY --from=static /usr/src/app/public /public
 
 EXPOSE 2015 9180
-WORKDIR /usr/src/app
-VOLUME /usr/src/app/public
-
-RUN apk add --no-cache openssh-client git build-base bash libpng-dev
-COPY Caddyfile /etc/Caddyfile
-ADD package.json yarn.lock _config.yml /usr/src/app/
-RUN yarn && \
-    git clone https://github.com/redbrick/hexo-theme-icarus.git themes/redbrick-theme && \
-    yarn install-theme
-ADD source /usr/src/app/source
-
 ENTRYPOINT ["/bin/parent", "caddy"]
 CMD ["--conf", "/etc/Caddyfile", "--log", "stdout", "--agree=$ACME_AGREE"]

Dockerfile

@@ -12,13 +12,15 @@
   },
   "license": "GPL-3.0",
   "scripts": {
-    "postinstall":
-      "git submodule init && git submodule update --remote && cd themes/redbrick-theme && yarn",
+    "postinstall": "cd themes/redbrick-theme && yarn",
     "build": "hexo g",
     "precommit": "lint-staged"
   },
   "lint-staged": {
-    "*.{js,json,css,md}": ["prettier --write", "git add"]
+    "*.{js,json,css,md}": [
+      "prettier --write",
+      "git add"
+    ]
   },
   "hexo": {
     "version": "3.7.1"