use new s6-rc layout

This commit is contained in:
Sebastian Hugentobler 2022-02-15 15:35:17 +01:00
parent b13f5acdb8
commit eaec10c401
Signed by: shu
GPG Key ID: BB32CF3CA052C2F0
10 changed files with 21 additions and 19 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: variables:
IMAGE_NAME: thallian/murmur CONTAINER_NAME: thallian/murmur
build: build:
stage: build stage: build
image:
name: gcr.io/kaniko-project/executor:debug
entrypoint: [""]
script: script:
- docker login -u $DOCKER_USER -p $DOCKER_PASSWORD $DOCKER_REGISTRY - mkdir -p /kaniko/.docker
- docker build -t $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 build -t $IMAGE_NAME:$CI_COMMIT_REF_NAME . - >-
- docker build -t $IMAGE_NAME:latest . /kaniko/executor
- docker push $IMAGE_NAME:$CI_COMMIT_SHA --context "$CI_PROJECT_DIR"
- docker push $IMAGE_NAME:$CI_COMMIT_REF_NAME --dockerfile "$CI_PROJECT_DIR/Dockerfile"
- docker push $IMAGE_NAME:latest --destination "$CONTAINER_NAME:$CI_COMMIT_SHA"
--destination "$CONTAINER_NAME:$CI_COMMIT_REF_NAME"
--destination "$CONTAINER_NAME:latest"

View File

@ -1,3 +1,3 @@
#!/usr/bin/with-contenv sh #!/bin/sh
murmurd -ini /etc/murmur.ini -supw $ADMIN_PASSWORD murmurd -ini /etc/murmur.ini -supw $ADMIN_PASSWORD

View File

@ -0,0 +1 @@
confd

View File

@ -0,0 +1 @@
oneshot

View File

@ -0,0 +1 @@
admin-pw

View File

@ -0,0 +1,2 @@
confd
admin-pw

View File

@ -1,3 +1,3 @@
#!/usr/bin/with-contenv sh #!/bin/sh
exec murmurd -fg -ini /etc/murmur.ini exec murmurd -fg -ini /etc/murmur.ini

View File

@ -0,0 +1 @@
longrun