use new s6-rc layout
This commit is contained in:
parent
5cef43fdaa
commit
fc8c0a489f
@ -1,12 +1,18 @@
|
||||
stages:
|
||||
- build
|
||||
|
||||
variables:
|
||||
IMAGE_NAME: thallian/user-access
|
||||
CI_BUILD_ARCHS: "linux/amd64,linux/arm64"
|
||||
CONTAINER_NAME: thallian/user-access
|
||||
|
||||
build:
|
||||
stage: build
|
||||
script:
|
||||
- docker login -u $DOCKER_USER -p $DOCKER_PASSWORD $DOCKER_REGISTRY
|
||||
- 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 .
|
||||
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"
|
||||
|
2
rootfs/etc/cont-init.d/02-static-user → rootfs/bin/static-user
Normal file → Executable file
2
rootfs/etc/cont-init.d/02-static-user → rootfs/bin/static-user
Normal file → Executable file
@ -1,4 +1,4 @@
|
||||
#!/usr/bin/with-contenv sh
|
||||
#!/bin/sh
|
||||
|
||||
if [ ! -z ${STATIC_USER+x} ]; then
|
||||
echo ${STATIC_PASSWORD} | ftpasswd \
|
@ -1 +0,0 @@
|
||||
/var/lib/ftp/data/ true proftpd:access 0666 0777
|
2
rootfs/etc/s6-overlay/s6-rc.d/proftpd/dependencies
Normal file
2
rootfs/etc/s6-overlay/s6-rc.d/proftpd/dependencies
Normal file
@ -0,0 +1,2 @@
|
||||
confd
|
||||
static-user
|
3
rootfs/etc/s6-overlay/s6-rc.d/proftpd/run
Normal file
3
rootfs/etc/s6-overlay/s6-rc.d/proftpd/run
Normal file
@ -0,0 +1,3 @@
|
||||
#!/bin/sh
|
||||
|
||||
exec proftpd --nodaemon
|
1
rootfs/etc/s6-overlay/s6-rc.d/proftpd/type
Normal file
1
rootfs/etc/s6-overlay/s6-rc.d/proftpd/type
Normal file
@ -0,0 +1 @@
|
||||
longrun
|
1
rootfs/etc/s6-overlay/s6-rc.d/static-user/dependencies
Normal file
1
rootfs/etc/s6-overlay/s6-rc.d/static-user/dependencies
Normal file
@ -0,0 +1 @@
|
||||
confd
|
1
rootfs/etc/s6-overlay/s6-rc.d/static-user/type
Normal file
1
rootfs/etc/s6-overlay/s6-rc.d/static-user/type
Normal file
@ -0,0 +1 @@
|
||||
oneshot
|
1
rootfs/etc/s6-overlay/s6-rc.d/static-user/up
Normal file
1
rootfs/etc/s6-overlay/s6-rc.d/static-user/up
Normal file
@ -0,0 +1 @@
|
||||
static-user
|
@ -1,3 +0,0 @@
|
||||
#!/usr/bin/with-contenv sh
|
||||
|
||||
exec proftpd --nodaemon
|
Loading…
Reference in New Issue
Block a user