Skip to content

Commit a229cd0

Browse files
committed
Fix gitlab-ci
1 parent 3ea3cf0 commit a229cd0

File tree

1 file changed

+3
-33
lines changed

1 file changed

+3
-33
lines changed

.gitlab-ci.yml

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,27 @@ stages:
33
- lint
44
- test
55
- build
6-
- container
76

87
variables:
98
WORKDIR: frontend-angular
109
NODE_VERSION: "20"
11-
IMAGE_NAME: $DOCKER_USERNAME/frontend-angular
12-
CI_PROJ_CACHE_KEY: "node-${CI_COMMIT_REF_SLUG}"
1310

1411
cache:
15-
key: "${CI_PROJ_CACHE_KEY}"
12+
key: "node-${CI_COMMIT_REF_SLUG}"
1613
paths:
1714
- ${WORKDIR}/node_modules
1815

1916
.install_base:
2017
image: node:${NODE_VERSION}
2118
before_script:
2219
- cd ${WORKDIR}
23-
- node -v
2420
- npm ci
2521

2622
install:
2723
stage: install
2824
extends: .install_base
2925
script:
30-
- echo "ok"
26+
- node -v
3127

3228
lint:
3329
stage: lint
@@ -40,8 +36,7 @@ test:
4036
image: node:${NODE_VERSION}
4137
before_script:
4238
- cd ${WORKDIR}
43-
- apt-get update
44-
- apt-get install -y chromium
39+
- apt-get update && apt-get install -y chromium
4540
- export CHROME_BIN=/usr/bin/chromium
4641
- npm ci
4742
script:
@@ -52,8 +47,6 @@ test:
5247
junit: ${WORKDIR}/junit.xml
5348
paths:
5449
- ${WORKDIR}/coverage
55-
rules:
56-
- if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event"
5750

5851
build:
5952
stage: build
@@ -64,26 +57,3 @@ build:
6457
paths:
6558
- ${WORKDIR}/dist
6659
expire_in: 7 days
67-
68-
docker:
69-
stage: container
70-
image: docker:27
71-
services:
72-
- docker:27-dind
73-
variables:
74-
DOCKER_HOST: tcp://docker:2375
75-
DOCKER_TLS_CERTDIR: ""
76-
before_script:
77-
- cd ${WORKDIR}
78-
- docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
79-
script:
80-
- docker build -t "$IMAGE_NAME:$CI_COMMIT_SHORT_SHA" -f Dockerfile .
81-
- docker push "$IMAGE_NAME:$CI_COMMIT_SHORT_SHA"
82-
- |
83-
if [ "$CI_COMMIT_BRANCH" = "$CI_DEFAULT_BRANCH" ]; then
84-
docker tag "$IMAGE_NAME:$CI_COMMIT_SHORT_SHA" "$IMAGE_NAME:latest"
85-
docker push "$IMAGE_NAME:latest"
86-
fi
87-
needs: ["build"]
88-
rules:
89-
- if: $CI_PIPELINE_SOURCE == "push"

0 commit comments

Comments
 (0)