From 6e3d0aaa2e2301e43db838d615cc8db93ada753a Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Mon, 19 Aug 2024 18:03:58 +0200 Subject: [PATCH] chore(gitlab-ci): work on podman config --- .gitlab-ci.yml | 16 ++++++++-------- Makefile | 1 - 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d2d40f91e..5d7e94c42 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,7 @@ frontend image: stage: build images script: # TODO: define make target for this? - - make -- --docker-build-frontend-build FRADRIVE_SERVICE=frontend CONTAINER_RUNNER=podman-compose + - make -- --docker-build-frontend-build FRADRIVE_SERVICE=frontend CONTAINER_RUNNER=podman-compose --privileged - podman image save frontend | gzip > docker/frontend/image.tar.gz artifacts: paths: @@ -61,7 +61,7 @@ frontend build: artifacts: true script: - &load-frontend-image zcat docker/frontend/image.tar.gz | podman image load - - make -- --docker-run-frontend-build FRADRIVE_SERVICE=frontend CONTAINER_RUNNER=podman-compose + - make -- --docker-run-frontend-build FRADRIVE_SERVICE=frontend CONTAINER_RUNNER=podman-compose --privileged artifacts: paths: - /fradrive/node_modules @@ -80,7 +80,7 @@ frontend lint: artifacts: true script: - *load-frontend-image - - make -- --docker-run-frontend-lint FRADRIVE_SERVICE=frontend CONTAINER_RUNNER=podman-compose + - make -- --docker-run-frontend-lint FRADRIVE_SERVICE=frontend CONTAINER_RUNNER=podman-compose --privileged cache: *frontend-cache frontend test: @@ -92,7 +92,7 @@ frontend test: artifacts: true script: - *load-frontend-image - - make -- --docker-run-frontend-test FRADRIVE_SERVICE=frontend CONTAINER_RUNNER=podman-compose + - make -- --docker-run-frontend-test FRADRIVE_SERVICE=frontend CONTAINER_RUNNER=podman-compose --privileged cache: *frontend-cache @@ -114,7 +114,7 @@ backend image: stage: build images script: # TODO: define make target for this? - - make -- --docker-build-backend-build FRADRIVE_SERVICE=backend CONTAINER_RUNNER=podman-compose + - make -- --docker-build-backend-build FRADRIVE_SERVICE=backend CONTAINER_RUNNER=podman-compose --privileged - podman image save backend | gzip > docker/backend/image.tar.gz artifacts: paths: @@ -129,7 +129,7 @@ backend build: artifacts: true script: - &load-backend-image zcat docker/backend/image.tar.gz | podman image load - - make -- --docker-run-backend-build FRADRIVE_SERVICE=backend CONTAINER_RUNNER=podman-compose + - make -- --docker-run-backend-build FRADRIVE_SERVICE=backend CONTAINER_RUNNER=podman-compose --privileged artifacts: paths: - /fradrive/.stack/ @@ -143,7 +143,7 @@ backend lint: artifacts: true script: - *load-backend-image - - make -- --docker-run-backend-lint FRADRIVE_SERVICE=backend CONTAINER_RUNNER=podman-compose + - make -- --docker-run-backend-lint FRADRIVE_SERVICE=backend CONTAINER_RUNNER=podman-compose --privileged cache: *backend-cache backend test: @@ -155,7 +155,7 @@ backend test: artifacts: true script: - *load-backend-image - - make -- --docker-run-backend-test FRADRIVE_SERVICE=backend CONTAINER_RUNNER=podman-compose + - make -- --docker-run-backend-test FRADRIVE_SERVICE=backend CONTAINER_RUNNER=podman-compose --privileged cache: *backend-cache push backend image: diff --git a/Makefile b/Makefile index adfc188f6..b05f58d28 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,6 @@ lint: frontend-lint backend-lint .PHONY: test test: frontend-test backend-test i18n-check -# TODO: dockerify .PHONY: backend-% backend-%: --backend-%-dev;