diff --git a/docker/zammad/Dockerfile b/docker/zammad/Dockerfile index ac73edb..1eee0b4 100644 --- a/docker/zammad/Dockerfile +++ b/docker/zammad/Dockerfile @@ -1,6 +1,30 @@ -FROM zammad/zammad-docker-compose:5.4.0-1 AS builder +FROM zammad/zammad-docker-compose:5.4.1 AS builder COPY auto_install ${ZAMMAD_TMP_DIR}/auto_install +USER root +RUN set -ex; \ + apt-get update; \ + apt-get install -y --no-install-recommends git libclang-dev clang llvm pkg-config nettle-dev rustc cargo libmariadb-dev; + +ARG SEQUOIA_PROJECT_URL=https://gitlab.com/sequoia-pgp/sequoia-ffi.git +ARG SEQUOIA_GIT_TAG=main +ENV SEQUOIA_DIR=/usr/lib/sequoia +ENV LD_LIBRARY_PATH=${SEQUOIA_DIR}/target/debug + +RUN git clone -b "${SEQUOIA_GIT_TAG}" --single-branch --depth 1 "${SEQUOIA_PROJECT_URL}" "${SEQUOIA_DIR}"; +WORKDIR ${SEQUOIA_DIR} +RUN cargo update +RUN cargo build -p sequoia-openpgp-ffi; +RUN ls -la "${SEQUOIA_DIR}/target/debug"; +# RUN chown -R "${ZAMMAD_USER}":"${ZAMMAD_USER}" "${SEQUOIA_DIR}" +# WORKDIR ${ZAMMAD_TMP_DIR} +# RUN echo "gem 'ruby_openpgp', git: 'https://github.com/throneless-tech/ruby_openpgp', branch: 'signing-and-userids'" >> Gemfile.local ; \ +# echo "gem 'rails-observers'" >> Gemfile.local ; \ +# bundle update tcr; \ +# bundle install --without test development mysql ; + # RUN sed -i "s/# create install ready file/bundle exec rake zammad:package:migrate/g" contrib/docker/docker-entrypoint.sh -FROM zammad/zammad-docker-compose:5.4.0-1 -COPY --from=builder ${ZAMMAD_TMP_DIR} ${ZAMMAD_TMP_DIR} +# FROM zammad/zammad-docker-compose:5.4.1 +# COPY --from=builder ${ZAMMAD_TMP_DIR} ${ZAMMAD_TMP_DIR} +# COPY --from=builder ${SEQUOIA_DIR} ${SEQUOIA_DIR} +# COPY --from=builder /usr/local/bundle /usr/local/bundle diff --git a/package-lock.json b/package-lock.json index 9d79c90..f9ae443 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ ] }, "apps/leafcutter": { - "version": "0.1.53", + "version": "0.1.54", "dependencies": { "@emotion/cache": "^11.10.3", "@emotion/react": "^11.10.4",