diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8cf3dbc..0049769 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,7 @@ build_flask: - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker push $IMAGE_TAG -build_api: +build_tester: stage: build tags: - shell @@ -35,6 +35,7 @@ build_api: - echo "Build api image" - export +# https://gitlab.com/gitlab-org/gitlab-runner/-/issues/26785 unit_test: stage: test services: @@ -42,7 +43,9 @@ unit_test: alias: zeo - name: $CI_REGISTRY_IMAGE/webui:$CI_COMMIT_REF_SLUG alias: webui - image: ubuntu:20.04 + image: + name: $CI_REGISTRY_IMAGE/webui:$CI_COMMIT_REF_SLUG + entrypoint: ["tester.sh"] tags: - docker - ubuntu @@ -50,6 +53,5 @@ unit_test: paths: - var/ script: - - apt-get install -y wget - mkdir var - wget webui:5000 -o var/index.html diff --git a/src/webui/Dockerfile b/src/webui/Dockerfile index 5b12a9c..8d5128f 100644 --- a/src/webui/Dockerfile +++ b/src/webui/Dockerfile @@ -1,11 +1,13 @@ FROM python:3.9-slim RUN apt-get update && apt-get install -y \ gcc \ + wget \ && rm -rf /var/lib/apt/lists/* RUN pip install ZEO==5.2.1 RUN pip install flask -WORKDIR /flaskr COPY . . +RUN chmod +x /tester.sh +RUN chmod +x /run.sh ENV FLASK_APP=flaskr/zeo_db EXPOSE 5000 CMD python3 -m flask run --host=0.0.0.0 \ No newline at end of file diff --git a/src/webui/tester.sh b/src/webui/tester.sh new file mode 100644 index 0000000..65c3873 --- /dev/null +++ b/src/webui/tester.sh @@ -0,0 +1,2 @@ +mkdir var +wget webui:5000 -o var/index.html