diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b501e3f65f126892327a78b9856950e794527eb3..808e3fdde8ede67ffa36c6f0724969894e38b5a0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,6 @@ --- include: - local: 'images/.utils/gitlab-ci.yaml' - - local: 'images/kos/.gitlab-ci.yaml' - local: 'charts/.utils/gitlab-ci.yaml' stages: - lint diff --git a/images/.utils/gitlab-ci.yaml b/images/.utils/gitlab-ci.yaml index c8fa48fb4c7ce2378a71d36ee2dc38115605cf1d..939ab9d758f531f844078f4fae7d0623c514d9d0 100644 --- a/images/.utils/gitlab-ci.yaml +++ b/images/.utils/gitlab-ci.yaml @@ -7,6 +7,7 @@ - koolbox - synadm - query-exposer + - kos container-build-release: stage: build diff --git a/images/kos/.gitlab-ci.yaml b/images/kos/.gitlab-ci.yaml deleted file mode 100644 index b1e5a2c48de37492a462012f56077269a76f3e68..0000000000000000000000000000000000000000 --- a/images/kos/.gitlab-ci.yaml +++ /dev/null @@ -1,55 +0,0 @@ -### This separate build pipeline is required, because rpm-ostree and kaniko don't work together as expected. -build-kos: - stage: build - image: quay.io/containers/podman:v4.3.1 - variables: - CI_REGISTRY_IMAGE: quay.io/shivering-isles/kos - before_script: - - podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - script: - - podman build --pull - --label "org.opencontainers.image.source=$CI_PROJECT_URL/-/tree/$CI_COMMIT_SHA/images/kos" - --label "org.opencontainers.image.revision=$CI_COMMIT_SHA" - --label "org.opencontainers.image.title=kOS" - --label "quay.expires-after=12w" - -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA" - --format docker - images/kos - - podman push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA" - - podman push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA" "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" - rules: - - if: '$CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push"' - changes: - paths: - - images/kos/**/* - compare_to: main - tags: - - hetzner - -### This separate build pipeline is required, because rpm-ostree and kaniko don't work together as expected. -build-kos-release: - stage: build - image: quay.io/containers/podman:v4.3.1 - variables: - CI_REGISTRY_IMAGE: quay.io/shivering-isles/kos - before_script: - - podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - script: - - . images/kos/.release - export release - - podman build --pull - --label "org.opencontainers.image.source=$CI_PROJECT_URL/-/tree/$CI_COMMIT_SHA/images/kos" - --label "org.opencontainers.image.revision=$CI_COMMIT_SHA" - --label "org.opencontainers.image.title=kOS" - -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA" - --format docker - images/kos - - podman push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA" - - podman push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA" "$CI_REGISTRY_IMAGE:${release}" - rules: - - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push"' - changes: - paths: - - images/kos/**/* - tags: - - hetzner \ No newline at end of file