From bc381e0361a8d4c25c91e8b46a7e345b2599d2be Mon Sep 17 00:00:00 2001 From: Darren Clarke Date: Mon, 24 Jul 2023 07:36:29 +0200 Subject: [PATCH] Zammad Docker build updates 1 --- .gitlab-ci.yml | 3 ++- docker/zammad/Dockerfile | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c05d931..2e8a7d9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -207,7 +207,8 @@ zammad-docker-build: - npm install -g turbo - npm ci - turbo build --force --filter zammad-addon-* - - ls -al addons + - pwd + - ls -al ./docker/zammad/addons - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - DOCKER_BUILDKIT=1 docker build --pull --no-cache -t ${DOCKER_NS}:${DOCKER_TAG} -f ${DOCKERFILE_PATH} ${DOCKER_CONTEXT} - docker push ${DOCKER_NS}:${DOCKER_TAG} diff --git a/docker/zammad/Dockerfile b/docker/zammad/Dockerfile index 6ef88bc..a751de9 100644 --- a/docker/zammad/Dockerfile +++ b/docker/zammad/Dockerfile @@ -1,6 +1,7 @@ ARG ZAMMAD_VERSION=6.0.0-32 FROM zammad/zammad-docker-compose:${ZAMMAD_VERSION} AS builder RUN mkdir -p /opt/zammad/contrib/link/addons +RUN ls -al addons COPY addons ${ZAMMAD_DIR}/contrib/link/addons COPY setup.rb ${ZAMMAD_DIR}/contrib/link/setup.rb COPY install.rb ${ZAMMAD_DIR}/contrib/link/install.rb