Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add scilog requirement installing from github #28

Merged
merged 2 commits into from
Aug 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 3 additions & 14 deletions importTools/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,21 +1,10 @@
# dev image
FROM python:3.8-slim as dev
FROM python:3.10-slim
ENV PYTHONDONTWRITEBYTECODE 1
WORKDIR /usr/src/app

COPY poetry.lock pyproject.toml ./
RUN pip install poetry \
&& poetry config virtualenvs.create false
RUN poetry install --no-interaction --no-ansi \
&& poetry export -f requirements.txt --output requirements.txt

FROM python:3.8-slim AS prod
RUN apt-get update && apt-get install -y git
WORKDIR /usr/src/app
# copy and install dependencies
COPY --from=dev /usr/src/app/requirements.txt ./
COPY requirements.txt update_locations.py ./
RUN pip install -r requirements.txt
# copy app sources
COPY ./*.py ./
COPY scilog scilog

CMD ["python", "update_locations.py"]
1 change: 0 additions & 1 deletion importTools/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ services:
app:
build:
context: .
target: dev
volumes:
- .:/usr/src/app
- .env:/usr/src/app/.env
Expand Down
99 changes: 0 additions & 99 deletions importTools/poetry.lock

This file was deleted.

16 changes: 0 additions & 16 deletions importTools/pyproject.toml

This file was deleted.

7 changes: 7 additions & 0 deletions importTools/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
certifi==2022.6.15
charset-normalizer==2.1.0
idna==3.3
python-dotenv==0.20.0
requests==2.28.1
scilog @ git+https://github.com/paulscherrerinstitute/scilog.git@03fdf4d35b4d2ce152328b3761a6da5a42f97681#subdirectory=sdk/python
urllib3==1.26.11