Skip to content
Snippets Groups Projects
Commit b17059b0 authored by nimrod's avatar nimrod
Browse files

Seperate stages for regular and base images.

Some images are base images for other images. There's a need to build
the base images first.
parent e75acfde
Branches
No related tags found
No related merge requests found
Pipeline #2411 failed
...@@ -7,12 +7,29 @@ include: ...@@ -7,12 +7,29 @@ include:
- project: shore/ci-stuff - project: shore/ci-stuff
file: templates/containerfiles.yml file: templates/containerfiles.yml
# Base image templates:
stages:
- build-base
- deploy-base
- build
- deploy
.container-build-base:
extends: .container-build
stage: build-base
.container-push-base:
extends: .container-push
stage: deploy-base
# cgit image: # cgit image:
build-cgit: build-cgit:
extends: .container-build extends: .container-build
variables: variables:
CONTEXT: cgit CONTEXT: cgit
needs:
- job: push-httpd
push-cgit: push-cgit:
extends: .container-push extends: .container-push
...@@ -26,12 +43,12 @@ push-cgit: ...@@ -26,12 +43,12 @@ push-cgit:
# httpd latest image: # httpd latest image:
build-httpd: build-httpd:
extends: .container-build extends: .container-build-base
variables: variables:
CONTEXT: httpd/buster CONTEXT: httpd/buster
push-httpd: push-httpd:
extends: .container-push extends: .container-push-base
variables: variables:
CONTEXT: httpd/buster CONTEXT: httpd/buster
IMAGE: httpd IMAGE: httpd
...@@ -42,7 +59,7 @@ push-httpd: ...@@ -42,7 +59,7 @@ push-httpd:
# httpd buster image: # httpd buster image:
push-httpd-buster: push-httpd-buster:
extends: .container-push extends: .container-push-base
variables: variables:
CONTEXT: httpd/buster CONTEXT: httpd/buster
IMAGE: httpd IMAGE: httpd
...@@ -54,7 +71,7 @@ push-httpd-buster: ...@@ -54,7 +71,7 @@ push-httpd-buster:
# httpd bullseye image: # httpd bullseye image:
build-httpd-bullseye: build-httpd-bullseye:
extends: .container-build extends: .container-build-base
variables: variables:
CONTEXT: httpd/bullseye CONTEXT: httpd/bullseye
...@@ -88,12 +105,12 @@ push-sshd: ...@@ -88,12 +105,12 @@ push-sshd:
# crond image: # crond image:
build-crond: build-crond:
extends: .container-build extends: .container-build-base
variables: variables:
CONTEXT: crond CONTEXT: crond
push-crond: push-crond:
extends: .container-push extends: .container-push-base
variables: variables:
CONTEXT: crond CONTEXT: crond
IMAGE: cron IMAGE: cron
...@@ -123,6 +140,8 @@ build-webdav: ...@@ -123,6 +140,8 @@ build-webdav:
extends: .container-build extends: .container-build
variables: variables:
CONTEXT: webdav CONTEXT: webdav
needs:
- job: push-httpd
push-webdav: push-webdav:
extends: .container-push extends: .container-push
......
FROM registry.shore.co.il/httpd:bullseye # hadolint ignore=DL3006
FROM registry.shore.co.il/httpd
USER root USER root
RUN a2enmod dav && \ RUN a2enmod dav && \
a2enmod dav_fs && \ a2enmod dav_fs && \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment