public/pipglr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix' into 'main'

Browse Source 
Fix CI/CD typo and other misc items

See merge request qontainers/pipglr!4
This commit is contained in:
Chris Evich
2022-11-16 15:07:01 +00:00
parent af48308a15 04b61422a9
commit e214a0549c
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
/.pre-commit-config.yaml

27
.gitlab-ci.yml
View File

@@ -15,13 +15,22 @@ build:
BASE_TAG: latest BASE_TAG: latest
FLAVOR: stable FLAVOR: stable
script: script:
- mkdir -p /kaniko/.docker - 'mkdir -p /kaniko/.docker'
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json - 'echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json'
- IMAGE_TAG="${CI_COMMIT_TAG:+${CI_COMMIT_TAG}}${CI_MERGE_REQUEST_IID:+mr${CI_MERGE_REQUEST_IID}${CI_COMMIT_BRANCH:+${CI_COMMIT_BRANCH/main/latest}}" - |
- >- echo "Select CI env. vars.:";
/kaniko/executor printenv | egrep '^CI_' | sort
--context $CI_PROJECT_DIR # N/B: There could be more than one merge-request open with this branch's HEAD
--dockerfile $CI_PROJECT_DIR/Containerfile - |
--destination "$CI_REGISTRY_IMAGE:${IAMGE_TAG}" IMAGE_TAG="${CI_COMMIT_TAG:+${CI_COMMIT_TAG}}${CI_COMMIT_BRANCH:+${CI_COMMIT_BRANCH/main/latest}}";
--build-arg "BASE_TAG=$BASE_TAG" if [[ -n "$CI_OPEN_MERGE_REQUESTS" ]]; then
IMAGE_TAG=mr$(echo "${CI_OPEN_MERGE_REQUESTS}" | cut -d, -f -1 | cut -d\! -f 2);
fi
echo "Building/Pushing to: ${CI_REGISTRY_IMAGE}:${IMAGE_TAG}";
- |
/kaniko/executor \
--context $CI_PROJECT_DIR \
--dockerfile $CI_PROJECT_DIR/Containerfile \
--destination "${CI_REGISTRY_IMAGE}:${IMAGE_TAG}" \
--build-arg "BASE_TAG=$BASE_TAG" \
--build-arg "FLAVOR=$FLAVOR" --build-arg "FLAVOR=$FLAVOR"

4
Containerfile
View File

@@ -107,11 +107,11 @@ ENTRYPOINT ["/usr/local/bin/gitlab-runner-wrapper"]
# Gitlab-runner configuration options. Default to unprivileged (nested) # Gitlab-runner configuration options. Default to unprivileged (nested)
# runner. Privileged is required to permit nested container image building. # runner. Privileged is required to permit nested container image building.
ARG RUNNER_NAME="pipglr" ARG RUNNER_NAME="qontainers-pipglr"
ARG PRIVILEGED_RUNNER="false" ARG PRIVILEGED_RUNNER="false"
# Tags allow pinning jobs to specific runners, comma-separated list of # Tags allow pinning jobs to specific runners, comma-separated list of
# tags to add to runner (no spaces!) # tags to add to runner (no spaces!)
ARG RUNNER_TAGS="podman_in_podman" ARG RUNNER_TAGS="podman-in-podman"
# Permit running jobs without any tag at all # Permit running jobs without any tag at all
ARG RUNNER_UNTAGGED="true" ARG RUNNER_UNTAGGED="true"
ENV REGISTER_NON_INTERACTIVE="true" \ ENV REGISTER_NON_INTERACTIVE="true" \