sr2/link-stack
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Zammad docker and Link structure updates

Browse source
This commit is contained in:
Darren Clarke 2023-07-10 10:13:06 +00:00 • committed by GitHub
parent 2a37297ae1
commit 60b82f6fb4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 94 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

16
docker/zammad/Dockerfile
View file

@ -1,8 +1,9 @@
FROM zammad/zammad-docker-compose:6.0.0 AS builder
ARG ZAMMAD_VERSION=6.0.0-32
FROM zammad/zammad-docker-compose:${ZAMMAD_VERSION} AS builder
RUN mkdir -p /opt/zammad/contrib/link/addons
COPY addons ${ZAMMAD_TMP_DIR}/contrib/link/addons
COPY setup.rb ${ZAMMAD_TMP_DIR}/contrib/link/setup.rb
RUN sed -i '/proxy_set_header X-Forwarded-User "";/d' ${ZAMMAD_TMP_DIR}/contrib/nginx/zammad.conf;
COPY addons ${ZAMMAD_DIR}/contrib/link/addons
COPY setup.rb ${ZAMMAD_DIR}/contrib/link/setup.rb
RUN sed -i '/proxy_set_header X-Forwarded-User "";/d' ${ZAMMAD_DIR}/contrib/nginx/zammad.conf;
USER root
RUN set -ex; \
@ -17,7 +18,7 @@ RUN git clone -b "${SEQUOIA_GIT_TAG}" --single-branch --depth 1 "${SEQUOIA_PROJE
WORKDIR ${SEQUOIA_DIR}
RUN export PATH=~/.cargo/bin:$PATH && cargo build -p sequoia-openpgp-ffi;
WORKDIR ${ZAMMAD_TMP_DIR}
WORKDIR ${ZAMMAD_DIR}
RUN echo "gem 'ruby_openpgp', git: 'https://github.com/throneless-tech/ruby_openpgp', branch: 'signing-and-userids'" >> Gemfile.local
RUN echo "gem 'rails-observers'" >> Gemfile.local
RUN bundle install --without test development mysql
@ -31,13 +32,14 @@ RUN sed -i '/^[[:space:]]*# create install ready file/ i\
FROM node:16.18.0-slim as node
FROM zammad/zammad-docker-compose:6.0.0
FROM zammad/zammad-docker-compose:${ZAMMAD_VERSION}
USER ${ZAMMAD_USER}
ENV SEQUOIA_DIR=/usr/lib/sequoia
ENV LD_LIBRARY_PATH=${SEQUOIA_DIR}/target/debug
ENV ZAMMAD_READY_FILE=${ZAMMAD_DIR}/var/zammad.ready
COPY --from=node /opt /opt
COPY --from=node /usr/local/bin /usr/local/bin
COPY --from=builder ${ZAMMAD_TMP_DIR} ${ZAMMAD_TMP_DIR}
COPY --from=builder ${ZAMMAD_DIR} ${ZAMMAD_DIR}
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