From 711642773b5a2084c95f41393edbe1d9cd0c7263 Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <sebastian@vanwa.ch>
Date: Tue, 15 Feb 2022 18:01:47 +0100
Subject: [PATCH] use new s6-rc layout

---
 .editorconfig                                 |  9 -------
 .gitlab-ci.yml                                | 25 +++++++++++--------
 Dockerfile                                    |  2 +-
 rootfs/etc/fix-attrs.d/01-wikijs              |  1 -
 .../s6-overlay/s6-rc.d/user/contents.d/wikijs |  0
 .../s6-overlay/s6-rc.d/wikijs/dependencies    |  1 +
 .../s6-rc.d}/wikijs/run                       |  2 +-
 rootfs/etc/s6-overlay/s6-rc.d/wikijs/type     |  1 +
 8 files changed, 19 insertions(+), 22 deletions(-)
 delete mode 100644 .editorconfig
 delete mode 100644 rootfs/etc/fix-attrs.d/01-wikijs
 create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/wikijs
 create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/wikijs/dependencies
 rename rootfs/etc/{services.d => s6-overlay/s6-rc.d}/wikijs/run (69%)
 create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/wikijs/type

diff --git a/.editorconfig b/.editorconfig
deleted file mode 100644
index d741e40..0000000
--- a/.editorconfig
+++ /dev/null
@@ -1,9 +0,0 @@
-root = true
-
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 4
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 392e0c1..3148d08 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,18 @@
 variables:
-    IMAGE_NAME: thallian/wikijs
+  CONTAINER_NAME: thallian/wikijs
 
 build:
-    stage: build
-    script:
-        - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD $DOCKER_REGISTRY
-        - docker build -t $IMAGE_NAME:$CI_COMMIT_SHA .
-        - docker build -t $IMAGE_NAME:$CI_COMMIT_REF_NAME .
-        - docker build -t $IMAGE_NAME:latest .
-        - docker push $IMAGE_NAME:$CI_COMMIT_SHA
-        - docker push $IMAGE_NAME:$CI_COMMIT_REF_NAME
-        - docker push $IMAGE_NAME:latest
+  stage: build
+  image:
+    name: gcr.io/kaniko-project/executor:debug
+    entrypoint: [""]
+  script:
+    - mkdir -p /kaniko/.docker
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(printf "%s:%s" "$CI_REGISTRY_USER" "$CI_REGISTRY_PASSWORD" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json
+    - >-
+      /kaniko/executor
+      --context "$CI_PROJECT_DIR"
+      --dockerfile "$CI_PROJECT_DIR/Dockerfile"
+      --destination "$CONTAINER_NAME:$CI_COMMIT_SHA"
+      --destination "$CONTAINER_NAME:$CI_COMMIT_REF_NAME"
+      --destination "$CONTAINER_NAME:latest"
diff --git a/Dockerfile b/Dockerfile
index 07586fb..080e8ac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ RUN npm install -g \
     webpack-cli \
     node-gyp
 
-ENV WIKIJS_VERSION=2.5.268
+ENV WIKIJS_VERSION=v2.5.275
 
 RUN git clone https://github.com/Requarks/wiki.git -b $WIKIJS_VERSION /build
 
diff --git a/rootfs/etc/fix-attrs.d/01-wikijs b/rootfs/etc/fix-attrs.d/01-wikijs
deleted file mode 100644
index c0cd45d..0000000
--- a/rootfs/etc/fix-attrs.d/01-wikijs
+++ /dev/null
@@ -1 +0,0 @@
-/home/wikijs/data true wikijs 0640 0750
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/wikijs b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/wikijs
new file mode 100644
index 0000000..e69de29
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/wikijs/dependencies b/rootfs/etc/s6-overlay/s6-rc.d/wikijs/dependencies
new file mode 100644
index 0000000..7ba7514
--- /dev/null
+++ b/rootfs/etc/s6-overlay/s6-rc.d/wikijs/dependencies
@@ -0,0 +1 @@
+confd
diff --git a/rootfs/etc/services.d/wikijs/run b/rootfs/etc/s6-overlay/s6-rc.d/wikijs/run
similarity index 69%
rename from rootfs/etc/services.d/wikijs/run
rename to rootfs/etc/s6-overlay/s6-rc.d/wikijs/run
index af624d1..a52894c 100644
--- a/rootfs/etc/services.d/wikijs/run
+++ b/rootfs/etc/s6-overlay/s6-rc.d/wikijs/run
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv sh
+#!/bin/sh
 
 cd /home/wikijs || exit
 exec s6-setuidgid wikijs node server
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/wikijs/type b/rootfs/etc/s6-overlay/s6-rc.d/wikijs/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/rootfs/etc/s6-overlay/s6-rc.d/wikijs/type
@@ -0,0 +1 @@
+longrun