diff options
| author | Max Resnick <max@ofmax.li> | 2022-02-14 21:47:02 -0800 |
|---|---|---|
| committer | Max Resnick <max@ofmax.li> | 2022-02-14 21:47:02 -0800 |
| commit | 5b416899b7956b3a8c250fe8264186cbf54356d1 (patch) | |
| tree | e5dc69f92cc9e38276821bdb29346bbd91912869 | |
| parent | d84dcee59df5f4c9e6468be43a195870519738ad (diff) | |
| download | grumpy-containers-5b416899b7956b3a8c250fe8264186cbf54356d1.tar.gz | |
add ci and version
| -rw-r--r-- | .gitlab-ci.yml | 55 | ||||
| -rw-r--r-- | src/cluster/Dockerfile | 2 |
2 files changed, 31 insertions, 26 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f0e74d5..943367d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,12 +1,12 @@ -image: +image: name: gcr.io/kaniko-project/executor:debug entrypoint: [""] .buildc: script: - VER="$(cat src/${IMG_NAME}/VERSION)" - - mkdir -p /kaniko/.docker - - echo "{\"auths\":{\"${CI_REGISTRY}\":{\"auth\":\"$(printf "%s:%s" "${CI_REGISTRY_USER}" "${CI_REGISTRY_PASSWORD}" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json + - mkdir -p /kaniko/.docker + - echo "{\"auths\":{\"${CI_REGISTRY}\":{\"auth\":\"$(printf "%s:%s" "${CI_REGISTRY_USER}" "${CI_REGISTRY_PASSWORD}" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json - |- /kaniko/executor --context "${CI_PROJECT_DIR}/src/${IMG_NAME}" \ --dockerfile "${CI_PROJECT_DIR}/src/${IMG_NAME}/Dockerfile" \ @@ -17,33 +17,38 @@ base: variables: IMG_NAME: "base" extends: .buildc -cgit: +cgit: needs: [base] - variables: - IMG_NAME: "cgit" - extends: .buildc -git-snapshot: + variables: + IMG_NAME: "cgit" + extends: .buildc +git-snapshot: needs: [base] - variables: - IMG_NAME: "git-snapshot" + variables: + IMG_NAME: "git-snapshot" extends: .buildc -gitolite: +gitolite: needs: [base] - variables: - IMG_NAME: "gitolite" - extends: .buildc -pelican: + variables: + IMG_NAME: "gitolite" + extends: .buildc +pelican: needs: [base] - variables: - IMG_NAME: "pelican" - extends: .buildc -sally: + variables: + IMG_NAME: "pelican" + extends: .buildc +cluster: needs: [base] - variables: - IMG_NAME: "sally" - extends: .buildc -static-files: + variables: + IMG_NAME: "cluster" + extends: .buildc +sally: + needs: [base] + variables: + IMG_NAME: "sally" + extends: .buildc +static-files: needs: [base] - variables: - IMG_NAME: "static-files" + variables: + IMG_NAME: "static-files" extends: .buildc diff --git a/src/cluster/Dockerfile b/src/cluster/Dockerfile index f9c7fa8..ac45daf 100644 --- a/src/cluster/Dockerfile +++ b/src/cluster/Dockerfile @@ -1,5 +1,5 @@ FROM gcr.io/google-containers/pause:latest -FROM debian:bullseye +FROM registry.gitlab.com/grumps/grumpy-containers/base:${BASE_VER} ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update -y \ && apt-get upgrade -y \ |