diff --git a/backend/Dockerfile b/backend/Dockerfile index 05e0558..b81335f 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -91,10 +91,7 @@ RUN set -eux; \ mkdir -p /artifacts; \ for bin in backend worker webdav admin; do \ cp "target/${TARGET}/release/${bin}" "/artifacts/${bin}"; \ - done; \ - cargo install diesel_cli --locked --no-default-features --features postgres --target "${TARGET}" --root /tmp/diesel-install; \ - cp /tmp/diesel-install/bin/diesel /artifacts/diesel; \ - rm -rf /tmp/diesel-install + done RUN set -eux; \ case "${TARGETARCH}" in \ @@ -134,11 +131,9 @@ COPY --from=builder /artifacts/backend /usr/local/bin/papercrate-backend COPY --from=builder /artifacts/worker /usr/local/bin/papercrate-worker COPY --from=builder /artifacts/webdav /usr/local/bin/papercrate-webdav COPY --from=builder /artifacts/admin /usr/local/bin/papercrate-admin -COPY --from=builder /artifacts/diesel /usr/local/bin/diesel COPY --from=builder /artifacts/libpdfium.so /usr/local/lib/libpdfium.so RUN ldconfig COPY migrations ./migrations -COPY diesel.toml ./ ENV RUST_LOG=info USER appuser diff --git a/k8s/papercrate/templates/webdav-deployment.yaml b/k8s/papercrate/templates/webdav-deployment.yaml index 7930b9a..ad2594a 100644 --- a/k8s/papercrate/templates/webdav-deployment.yaml +++ b/k8s/papercrate/templates/webdav-deployment.yaml @@ -29,8 +29,8 @@ spec: {{- end }} containers: - name: webdav - image: {{ include "papercrate.webdav.image" . }}:{{ include "papercrate.image.tag" (dict "image" .Values.webdav.image "Chart" .Chart) }} - imagePullPolicy: {{ .Values.webdav.image.pullPolicy }} + image: {{ include "papercrate.backend.image" . }}:{{ include "papercrate.image.tag" (dict "image" .Values.backend.image "Chart" .Chart) }} + imagePullPolicy: {{ .Values.backend.image.pullPolicy }} command: - /usr/local/bin/papercrate-webdav ports: