diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a6dd0ae..df18710 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,7 +41,7 @@ build standalone: stage: build script: - docker pull $CI_REGISTRY_IMAGE:standalone || true - - docker build --pull --cache-from $CI_REGISTRY_IMAGE:standalone --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA-standalone maubot/standalone + - docker build --pull --cache-from $CI_REGISTRY_IMAGE:standalone --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA-standalone . -f maubot/standalone/Dockerfile - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA-standalone push latest standalone: diff --git a/maubot/standalone/Dockerfile b/maubot/standalone/Dockerfile index 0dd0043..8f9b9f0 100644 --- a/maubot/standalone/Dockerfile +++ b/maubot/standalone/Dockerfile @@ -1,6 +1,8 @@ FROM docker.io/alpine:3.10 -RUN apk add --no-cache --virtual .build-deps \ +COPY . /opt/maubot +RUN cd /opt/maubot \ + && apk add --no-cache --virtual .build-deps \ python3-dev \ libffi-dev \ build-base \ @@ -9,6 +11,7 @@ RUN apk add --no-cache --virtual .build-deps \ py3-sqlalchemy \ py3-attrs \ py3-bcrypt \ + py3-cffi \ ca-certificates \ su-exec \ py3-psycopg2 \ @@ -16,5 +19,5 @@ RUN apk add --no-cache --virtual .build-deps \ py3-jinja2 \ py3-packaging \ py3-markdown \ - && pip3 install maubot \ + && pip3 install . \ && apk del .build-deps