From 5b5562f97b1603846420c2e8b7d6305b94606af7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Haas?= <juergen.haas@lakedrops.com>
Date: Sun, 20 Feb 2022 16:53:50 +0000
Subject: [PATCH] Add curl Optimize CI config
---
.gitlab-ci.yml | 33 ++++++---------------------------
Dockerfile | 2 +-
2 files changed, 7 insertions(+), 28 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 30f3585..74dd492 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,34 +1,13 @@
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-node-8:
+node:
stage: build
+ parallel:
+ matrix:
+ - VERSION: ['8-jessie-slim','10-jessie-slim','12-stretch-slim','13-stretch-slim']
script:
- - docker build --pull --build-arg NODE_VERSION=8-jessie-slim -t $CI_REGISTRY_IMAGE:8-jessie-slim .
- - docker push $CI_REGISTRY_IMAGE:8-jessie-slim
- only:
- - master
-
-node-10:
- stage: build
- script:
- - docker build --pull --build-arg NODE_VERSION=10-jessie-slim -t $CI_REGISTRY_IMAGE:10-jessie-slim .
- - docker push $CI_REGISTRY_IMAGE:10-jessie-slim
- only:
- - master
-
-node-12:
- stage: build
- script:
- - docker build --pull --build-arg NODE_VERSION=12-stretch-slim -t $CI_REGISTRY_IMAGE:12-stretch-slim .
- - docker push $CI_REGISTRY_IMAGE:12-stretch-slim
- only:
- - master
-
-node-13:
- stage: build
- script:
- - docker build --pull --build-arg NODE_VERSION=13-stretch-slim -t $CI_REGISTRY_IMAGE:13-stretch-slim .
- - docker push $CI_REGISTRY_IMAGE:13-stretch-slim
+ - docker build --pull --build-arg NODE_VERSION=${VERSION} -t $CI_REGISTRY_IMAGE:${VERSION} .
+ - docker push $CI_REGISTRY_IMAGE:${VERSION}
only:
- master
diff --git a/Dockerfile b/Dockerfile
index 28fec84..32502bc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ LABEL com.example.vendor="LakeDrops" \
description="Node container with build tools included."
RUN apt-get update -y && \
- apt-get install -y -q python3 make g++ && \
+ apt-get install -y -q python3 make g++ curl && \
ln -s python3 /usr/bin/python && \
\
apt-get clean && \
--
GitLab