use new s6-rc layout

.gitlab-ci.yml

@@ -1,12 +1,18 @@
-stages:
-    - build
-
 variables:
-    IMAGE_NAME: thallian/user-access
+  CONTAINER_NAME: thallian/user-access
-    CI_BUILD_ARCHS: "linux/amd64,linux/arm64"
 
 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 buildx build --platform "$CI_BUILD_ARCHS" --progress plain --pull --tag "$IMAGE_NAME:$CI_COMMIT_SHA" --tag "$IMAGE_NAME:$CI_COMMIT_REF_NAME" --tag "$IMAGE_NAME:latest" --push .
+    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"

rootfs/bin/static-user

@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv sh
+#!/bin/sh
 
 if [ ! -z ${STATIC_USER+x} ]; then
     echo ${STATIC_PASSWORD} | ftpasswd \

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

@@ -1 +0,0 @@
-/var/lib/ftp/data/ true proftpd:access 0666 0777

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

@@ -0,0 +1,2 @@
+confd
+static-user

rootfs/etc/s6-overlay/s6-rc.d/proftpd/run

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec proftpd --nodaemon

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

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

rootfs/etc/s6-overlay/s6-rc.d/static-user/dependencies

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

rootfs/etc/s6-overlay/s6-rc.d/static-user/type

@@ -0,0 +1 @@
+oneshot

rootfs/etc/s6-overlay/s6-rc.d/static-user/up

@@ -0,0 +1 @@
+static-user

rootfs/etc/services.d/proftpd/run

@@ -1,3 +0,0 @@
-#!/usr/bin/with-contenv sh
-
-exec proftpd --nodaemon