use new s6-rc layout

.editorconfig

@@ -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

.gitlab-ci.yml

@@ -1,13 +1,18 @@
 variables:
-    IMAGE_NAME: thallian/wikijs
+  CONTAINER_NAME: thallian/wikijs
 
 build:
-    stage: build
+  stage: build
-    script:
+  image:
-        - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD $DOCKER_REGISTRY
+    name: gcr.io/kaniko-project/executor:debug
-        - docker build -t $IMAGE_NAME:$CI_COMMIT_SHA .
+    entrypoint: [""]
-        - docker build -t $IMAGE_NAME:$CI_COMMIT_REF_NAME .
+  script:
-        - docker build -t $IMAGE_NAME:latest .
+    - mkdir -p /kaniko/.docker
-        - docker push $IMAGE_NAME:$CI_COMMIT_SHA
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(printf "%s:%s" "$CI_REGISTRY_USER" "$CI_REGISTRY_PASSWORD" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json
-        - docker push $IMAGE_NAME:$CI_COMMIT_REF_NAME
+    - >-
-        - docker push $IMAGE_NAME:latest
+      /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"

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
 

rootfs/etc/fix-attrs.d/01-wikijs

@@ -1 +0,0 @@
-/home/wikijs/data true wikijs 0640 0750

rootfs/etc/s6-overlay/s6-rc.d/wikijs/dependencies

@@ -0,0 +1 @@
+confd

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

rootfs/etc/s6-overlay/s6-rc.d/wikijs/type

@@ -0,0 +1 @@
+longrun