diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2e8a7d9..48c2fe3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -207,8 +207,6 @@ zammad-docker-build: - npm install -g turbo - npm ci - turbo build --force --filter zammad-addon-* - - 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 c488e94..434879f 100644 --- a/docker/zammad/Dockerfile +++ b/docker/zammad/Dockerfile @@ -1,8 +1,6 @@ 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 pwd -RUN ls -al 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 @@ -46,5 +44,3 @@ COPY --from=builder ${SEQUOIA_DIR} ${SEQUOIA_DIR} COPY --from=builder /usr/local/bundle /usr/local/bundle COPY --from=builder /docker-entrypoint.sh /docker-entrypoint.sh RUN ZAMMAD_SAFE_MODE=1 bundle exec rake assets:precompile - -