diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cfceb610072f92b0823081e9c111aa5136a746e5..bfa06ba57c354f429fb6f94be9cc8e35bb2dae0d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,25 +1,30 @@ -# Official docker image. image: quay.io/sheogorath/build-ah-engine +stages: + - analyse + - build + - test + - tag + - deploy + before_script: - podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY -build-master: - stage: build - script: - - podman build --pull -t "$CI_REGISTRY_IMAGE" . - - podman push "$CI_REGISTRY_IMAGE" - only: - - master - tags: - - docker +variables: + BAE_VERSION: "1.0.0" + SI_TOOLS_VERSION: "0.2.0" build: stage: build script: - - podman build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" . + - podman build --pull --build-arg SI_TOOLS_VERSION -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" . - podman push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" - except: + +tagging-master: + stage: tag + script: + - podman pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" + - si-tagging -l "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" "$CI_REGISTRY_IMAGE" "${BAE_VERSION}" + - si-push "$CI_REGISTRY_IMAGE" + only: - master - tags: - - docker diff --git a/Dockerfile b/Dockerfile index 82f77c22cdb04237f75b0431decb446b47cb748e..aa6ef1ab93bd5a1119accf6bb7c44ed1e8c1b299 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,14 @@ FROM fedora:31 COPY resources/storage.conf /etc/containers/ +ARG SI_TOOLS_VERSION=master + RUN true\ && dnf -y upgrade \ && dnf -y install podman buildah findutils git \ && dnf clean all \ && sed -e 's/cgroup_manager =.*/cgroup_manager = "cgroupfs"/' /usr/share/containers/libpod.conf > /etc/containers/libpod.conf \ - && git clone https://git.shivering-isles.com/shivering-isles/shell-tools.git ./shell-tools \ + && git clone -b "$SI_TOOLS_VERSION" --depth=3 https://git.shivering-isles.com/shivering-isles/shell-tools.git ./shell-tools \ && ./shell-tools/install.sh \ && rm -rf ./shell-tools \ && true