Merge branch 'dev' into 'main'
Update .gitlab-ci.yml file See merge request illegitimate/illegitimate-bot!286
This commit is contained in:
@@ -1,4 +1,18 @@
|
|||||||
docker-build:
|
merge:
|
||||||
|
image: docker:cli
|
||||||
|
stage: test
|
||||||
|
services:
|
||||||
|
- docker:dind
|
||||||
|
variables:
|
||||||
|
DOCKER_IMAGE_NAME: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
|
||||||
|
script:
|
||||||
|
- |
|
||||||
|
docker build . -f Dockerfile.cache -t node-cache
|
||||||
|
docker build -t "$DOCKER_IMAGE_NAME" .
|
||||||
|
rules:
|
||||||
|
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
|
||||||
|
|
||||||
|
build:
|
||||||
image: docker:cli
|
image: docker:cli
|
||||||
stage: build
|
stage: build
|
||||||
services:
|
services:
|
||||||
@@ -8,14 +22,10 @@ docker-build:
|
|||||||
before_script:
|
before_script:
|
||||||
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
|
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
|
||||||
script:
|
script:
|
||||||
- docker build . -f Dockerfile.cache -t node-cache
|
|
||||||
- docker build -t "$DOCKER_IMAGE_NAME" .
|
|
||||||
- |
|
- |
|
||||||
if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
|
docker build . -f Dockerfile.cache -t node-cache
|
||||||
|
docker build -t "$DOCKER_IMAGE_NAME" .
|
||||||
docker tag "$DOCKER_IMAGE_NAME" "$CI_REGISTRY_IMAGE:main"
|
docker tag "$DOCKER_IMAGE_NAME" "$CI_REGISTRY_IMAGE:main"
|
||||||
docker push "$CI_REGISTRY_IMAGE:main"
|
docker push "$CI_REGISTRY_IMAGE:main"
|
||||||
fi
|
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_COMMIT_BRANCH
|
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
|
||||||
exists:
|
|
||||||
- Dockerfile
|
|
||||||
@@ -1,3 +1,5 @@
|
|||||||
import { Illegitimate } from "utils/Illegitimate.js"
|
import { Illegitimate } from "utils/Illegitimate.js"
|
||||||
|
|
||||||
new Illegitimate().start()
|
new Illegitimate().start()
|
||||||
|
|
||||||
|
// test
|
||||||
|
|||||||
Reference in New Issue
Block a user