Loading .gitlab-ci.yml +28 −47 Original line number Diff line number Diff line Loading @@ -6,70 +6,51 @@ variables: REGISTRY: $CI_REGISTRY IMAGE: $CI_REGISTRY_IMAGE # before_script: before_script: # Log in to GitLab registry for docker builds # - echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin # after_script: # - docker logout $CI_REGISTRY - echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin after_script: - docker logout $CI_REGISTRY build:base: # -------------------- # Docker builds # -------------------- .build-template: stage: build tags: - docker-build variables: TARGET: base VARIANT: base script: - VERSION="${CI_COMMIT_TAG#v}" - echo $VERSION $VARIANT $IMAGE - docker build --build-arg PSEUDO_VERSION=$VERSION --target $TARGET -t $IMAGE:$VARIANT -t $IMAGE:${VERSION}-${VARIANT} . - echo docker push $IMAGE:$VARIANT - echo docker push $IMAGE:${VERSION}-${VARIANT} rules: - if: '$CI_COMMIT_TAG' # only run when a tag is pushed build:website: extends: .build-template variables: TARGET: website VARIANT: website # -------------------- # Docker builds # -------------------- # .build-template: # stage: build # tags: # - docker-build # script: # - VERSION="${CI_COMMIT_TAG#v}" # - docker build --build-arg PSEUDO_VERSION=$VERSION --target $TARGET -t $IMAGE:$VARIANT -t $IMAGE:${VERSION}-${VARIANT} . # - echo docker push $IMAGE:$VARIANT # - echo docker push $IMAGE:${VERSION}-${VARIANT} # rules: # - if: '$CI_COMMIT_TAG' # only run when a tag is pushed # build:website: # extends: .build-template # variables: # TARGET: website # VARIANT: website # build:ts: # extends: .build-template # variables: # TARGET: ts # VARIANT: ts build:ts: extends: .build-template variables: TARGET: ts VARIANT: ts # build:check: # extends: .build-template # variables: # TARGET: check # VARIANT: check build:check: extends: .build-template variables: TARGET: check VARIANT: check # build:all: # extends: .build-template # variables: # TARGET: all # VARIANT: all build:all: extends: .build-template variables: TARGET: all VARIANT: all # -------------------- Loading dockerfile +3 −5 Original line number Diff line number Diff line Loading @@ -10,18 +10,16 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* # Install uv RUN pip install --no-cache-dir uv setuptools-scm[simple]>=8 RUN pip install --no-cache-dir uv \ setuptools-scm[simple]>=8 WORKDIR /app COPY pyproject.toml uv.lock .python-version ./ COPY src/ src/ ENV SETUPTOOLS_SCM_PRETEND_VERSION_FOR_SAREF_PYPELINE=${PSEUDO_VERSION} RUN echo $SETUPTOOLS_SCM_PRETEND_VERSION_FOR_SAREF_PYPELINE RUN python -m pip show setuptools-scm && python -m setuptools_scm || true RUN uv pip install --system -e . RUN python -c "import setuptools_scm; print('setuptools-scm', setuptools_scm.__version__)" ENTRYPOINT ["saref-dev"] # ---- Website ---- FROM base AS website Loading Loading
.gitlab-ci.yml +28 −47 Original line number Diff line number Diff line Loading @@ -6,70 +6,51 @@ variables: REGISTRY: $CI_REGISTRY IMAGE: $CI_REGISTRY_IMAGE # before_script: before_script: # Log in to GitLab registry for docker builds # - echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin # after_script: # - docker logout $CI_REGISTRY - echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin after_script: - docker logout $CI_REGISTRY build:base: # -------------------- # Docker builds # -------------------- .build-template: stage: build tags: - docker-build variables: TARGET: base VARIANT: base script: - VERSION="${CI_COMMIT_TAG#v}" - echo $VERSION $VARIANT $IMAGE - docker build --build-arg PSEUDO_VERSION=$VERSION --target $TARGET -t $IMAGE:$VARIANT -t $IMAGE:${VERSION}-${VARIANT} . - echo docker push $IMAGE:$VARIANT - echo docker push $IMAGE:${VERSION}-${VARIANT} rules: - if: '$CI_COMMIT_TAG' # only run when a tag is pushed build:website: extends: .build-template variables: TARGET: website VARIANT: website # -------------------- # Docker builds # -------------------- # .build-template: # stage: build # tags: # - docker-build # script: # - VERSION="${CI_COMMIT_TAG#v}" # - docker build --build-arg PSEUDO_VERSION=$VERSION --target $TARGET -t $IMAGE:$VARIANT -t $IMAGE:${VERSION}-${VARIANT} . # - echo docker push $IMAGE:$VARIANT # - echo docker push $IMAGE:${VERSION}-${VARIANT} # rules: # - if: '$CI_COMMIT_TAG' # only run when a tag is pushed # build:website: # extends: .build-template # variables: # TARGET: website # VARIANT: website # build:ts: # extends: .build-template # variables: # TARGET: ts # VARIANT: ts build:ts: extends: .build-template variables: TARGET: ts VARIANT: ts # build:check: # extends: .build-template # variables: # TARGET: check # VARIANT: check build:check: extends: .build-template variables: TARGET: check VARIANT: check # build:all: # extends: .build-template # variables: # TARGET: all # VARIANT: all build:all: extends: .build-template variables: TARGET: all VARIANT: all # -------------------- Loading
dockerfile +3 −5 Original line number Diff line number Diff line Loading @@ -10,18 +10,16 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* # Install uv RUN pip install --no-cache-dir uv setuptools-scm[simple]>=8 RUN pip install --no-cache-dir uv \ setuptools-scm[simple]>=8 WORKDIR /app COPY pyproject.toml uv.lock .python-version ./ COPY src/ src/ ENV SETUPTOOLS_SCM_PRETEND_VERSION_FOR_SAREF_PYPELINE=${PSEUDO_VERSION} RUN echo $SETUPTOOLS_SCM_PRETEND_VERSION_FOR_SAREF_PYPELINE RUN python -m pip show setuptools-scm && python -m setuptools_scm || true RUN uv pip install --system -e . RUN python -c "import setuptools_scm; print('setuptools-scm', setuptools_scm.__version__)" ENTRYPOINT ["saref-dev"] # ---- Website ---- FROM base AS website Loading