diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f416545..99705f6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,14 +21,14 @@ build_image: services: - docker variables: - CONTAINER_NAME: ${CI_REGISTRY_IMAGE}/facturio + COMPOSE_FILE: docker-compose.build.yml before_script: - docker login ${CI_REGISTRY} -u gitlab-ci-token -p ${CI_JOB_TOKEN} script: - - docker build -t ${CONTAINER_NAME}:${CI_COMMIT_REF_NAME} . - - docker push ${CONTAINER_NAME}:${CI_COMMIT_REF_NAME} + - docker compose build + - docker compose push - | if [[ -n "${CI_COMMIT_TAG}" ]]; then - docker tag ${CONTAINER_NAME}:${CI_COMMIT_REF_NAME} ${CONTAINER_NAME}:${CI_COMMIT_TAG} - docker push ${CONTAINER_NAME}:${CI_COMMIT_TAG} + docker tag ${CI_REGISTRY_IMAGE}/facturio:${CI_COMMIT_REF_NAME} ${CI_REGISTRY_IMAGE}/facturio:${CI_COMMIT_TAG} + docker push ${CI_REGISTRY_IMAGE}/facturio:${CI_COMMIT_TAG} fi diff --git a/docker-compose.build.yml b/docker-compose.build.yml new file mode 100644 index 0000000..45efcc2 --- /dev/null +++ b/docker-compose.build.yml @@ -0,0 +1,7 @@ +services: + api: + image: ${CI_REGISTRY_IMAGE}/facturio:${CI_COMMIT_REF_NAME} + build: + context: . + dockerfile: Dockerfile + target: production