Skip to content
Snippets Groups Projects
Commit e58c6e06 authored by Benedikt's avatar Benedikt
Browse files

Auto stash before merge of "main" and "origin/main"

parent 93229f20
No related branches found
No related tags found
No related merge requests found
......@@ -3,20 +3,21 @@ FROM python:3.11
# WORKDIR /usr/src/app
ENV GIT_SSL_NO_VERIFY=1
# Set the environment variable for the HTTP proxy
ENV http_proxy="http://webproxy.bs.ptb.de:8080"
ENV https_proxy="http://webproxy.bs.ptb.de:8080"
#ENV http_proxy="http://webproxy.bs.ptb.de:8080"
#ENV https_proxy="http://webproxy.bs.ptb.de:8080"
# Set the environment variable for the NO_PROXY
# This ensures that the proxy is not used for ptb.de
ENV no_proxy="ptb.de"
#ENV no_proxy="ptb.de"
#RUN curl --header "PRIVATE-TOKEN: FcuX-ACu_Lp928iy_1nG" "https://gitlab1.ptb.de/api/v4/projects/2806/repository/files/requirements.txt/raw?ref=main" -o requirements.txt
# Install any needed packages specified in requirements.txt
RUN git clone https://dockerPull:FcuX-ACu_Lp928iy_1nG@gitlab1.ptb.de/digitaldynamicmeasurement/pydccdisplayer.git
RUN git clone https://dockerPull:Wz2547C6UNSQkkbuqhMY@gitlab1.ptb.de/digitaldynamicmeasurement/pydccdisplayer.git
RUN pip install --proxy=webproxy.bs.ptb.de:8080 --no-cache-dir -r pydccdisplayer/requirements.txt
#RUN pip install --proxy=webproxy.bs.ptb.de:8080 --no-cache-dir -r pydccdisplayer/requirements.txt
RUN pip install --no-cache-dir -r pydccdisplayer/requirements.txt
#COPY . .
EXPOSE 5003
......
bokeh~=3.3.1
pytest~=7.4.2
pytest-cov~=4.1.0
#-e git+https://pipPull:jLBHrAnhPp9s1-qHvB5A@gitlab1.ptb.de/digitaldynamicmeasurement/dcc_XMLJSONConv.git@release#egg=dcc_XMLJSONConv
-e git+https://pipPull:eVJmNgPKyXCjxgEqDquL@gitlab1.ptb.de/digitaldynamicmeasurement/py-dsi-vectors-and-tables.git@release#egg=dsiVectorsAndTables
-e git+https://gitlab1.ptb.de/digitaldynamicmeasurement/bokehCssPtb.git#egg=bokehCssPTB
-e git+https://dockerPull:-jVp9LBaxeKp9HKAe9dw@gitlab1.ptb.de/digitaldynamicmeasurement/bokehCssPtb.git#egg=bokehCssPTB
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment