Revert "ci: switch to rootless dind for insecure local registry"

This reverts commit c957c68f62.
This commit is contained in:
Bot 2026-03-02 00:16:53 +01:00
parent c957c68f62
commit 4c95cce611

View file

@ -4,65 +4,61 @@ stages:
variables: variables:
REGISTRY_HOST: "10.10.10.10:5050" REGISTRY_HOST: "10.10.10.10:5050"
IMAGE_NAME: "$REGISTRY_HOST/$CI_PROJECT_PATH" IMAGE_NAME: "$REGISTRY_HOST/$CI_PROJECT_PATH"
DOCKER_HOST: "tcp://docker:2375"
DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: ""
# Force clone via IP instead of hostname to bypass Unraid Docker DNS issues # Force clone via IP instead of hostname to bypass Unraid Docker DNS issues
CI_SERVER_URL: "http://10.10.10.10:9080" CI_SERVER_URL: "http://10.10.10.10:9080"
GITLAB_FEATURES: "" GITLAB_FEATURES: ""
docker-build: docker-build:
stage: build stage: build
image: docker:24.0.5 image:
services: name: gcr.io/kaniko-project/executor:v1.23.2-debug
- name: docker:24.0.5-dind-rootless entrypoint: [""]
alias: docker
command:
- "--insecure-registry=10.10.10.10:5050"
- "--tls=false"
rules: rules:
- if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH
before_script: before_script:
- docker info - mkdir -p /kaniko/.docker
- echo "$CI_REGISTRY_PASSWORD" | docker login "$REGISTRY_HOST" -u "$CI_REGISTRY_USER" --password-stdin - |
cat > /kaniko/.docker/config.json <<EOF
{
"auths": {
"$REGISTRY_HOST": {
"username": "$CI_REGISTRY_USER",
"password": "$CI_REGISTRY_PASSWORD"
}
}
}
EOF
script: script:
- | - |
if [ "$CI_COMMIT_REF_NAME" = "main" ]; then if [ "$CI_COMMIT_REF_NAME" = "main" ]; then
export TAG="main" TAG="main"
export VERSION="1.1.0" VERSION="1.1.0"
export CHANNEL="stable" CHANNEL="stable"
elif [ "$CI_COMMIT_REF_NAME" = "feature/nightly" ] || [ "$CI_COMMIT_REF_NAME" = "nightly" ]; then elif [ "$CI_COMMIT_REF_NAME" = "feature/nightly" ] || [ "$CI_COMMIT_REF_NAME" = "nightly" ]; then
export TAG="nightly" TAG="nightly"
export VERSION="1.1.0-nightly" VERSION="1.1.0-nightly"
export CHANNEL="nightly" CHANNEL="nightly"
else else
export CLEAN_TAG=$(echo "$CI_COMMIT_REF_NAME" | sed 's/\//-/g') CLEAN_TAG=$(echo "$CI_COMMIT_REF_NAME" | sed 's/\//-/g')
export TAG="$CLEAN_TAG" TAG="$CLEAN_TAG"
export VERSION="1.1.0-dev" VERSION="1.1.0-dev"
export CHANNEL="dev" CHANNEL="dev"
fi fi
- 'echo "Building for channel $CHANNEL with version $VERSION and tag $TAG"' DESTINATIONS="--destination=$IMAGE_NAME:$CI_COMMIT_SHA --destination=$IMAGE_NAME:$TAG"
- 'echo "Using registry image: $IMAGE_NAME"'
# Build
- docker pull $IMAGE_NAME:$TAG || true
- >
docker build
--cache-from $IMAGE_NAME:$TAG
--build-arg VITE_BUILD_CHANNEL=$CHANNEL
--build-arg VITE_APP_VERSION=$VERSION
-t $IMAGE_NAME:$CI_COMMIT_SHA
-t $IMAGE_NAME:$TAG
.
# Push
- docker push $IMAGE_NAME:$CI_COMMIT_SHA
- docker push $IMAGE_NAME:$TAG
# If main branch, also tag and push as latest
- |
if [ "$CI_COMMIT_REF_NAME" = "main" ]; then if [ "$CI_COMMIT_REF_NAME" = "main" ]; then
docker tag $IMAGE_NAME:$TAG $IMAGE_NAME:latest DESTINATIONS="$DESTINATIONS --destination=$IMAGE_NAME:latest"
docker push $IMAGE_NAME:latest
fi fi
echo "Building for channel $CHANNEL with version $VERSION and tag $TAG"
echo "Using registry image: $IMAGE_NAME"
/kaniko/executor \
--context "$CI_PROJECT_DIR" \
--dockerfile "$CI_PROJECT_DIR/Dockerfile" \
--build-arg "VITE_BUILD_CHANNEL=$CHANNEL" \
--build-arg "VITE_APP_VERSION=$VERSION" \
--insecure \
--insecure-registry "$REGISTRY_HOST" \
--skip-tls-verify-registry "$REGISTRY_HOST" \
$DESTINATIONS