use new s6-rc layout

This commit is contained in:
Sebastian Hugentobler 2022-02-15 18:01:47 +01:00
parent 4b0320ecdd
commit 711642773b
Signed by: shu
GPG Key ID: BB32CF3CA052C2F0
8 changed files with 19 additions and 22 deletions

View File

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

View File

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

View File

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

View File

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

View File

@ -0,0 +1 @@
confd

View File

@ -1,4 +1,4 @@
#!/usr/bin/with-contenv sh
#!/bin/sh
cd /home/wikijs || exit
exec s6-setuidgid wikijs node server

View File

@ -0,0 +1 @@
longrun