Skip to content

Commit a237f9e

Browse files
committed
Merge remote-tracking branch 'origin/main' into 66-implement-caching-on-get_configuration
2 parents b04eebe + fc6b6f2 commit a237f9e

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2727
COPY --from=build /venv/ /venv/
2828
COPY tests/test_data/beamline_parameters.txt tests/test_data/beamline_parameters.txt
2929
ENV PATH=/venv/bin:$PATH
30-
ARG BEAMLINE="dev"
31-
ENV BEAMLINE=${BEAMLINE}
3230

3331
# change this entrypoint if it is not the same as the repo
3432
CMD daq-config-server

src/daq_config_server/__main__.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,10 @@ def check_server_dependencies():
1414
import uvicorn # noqa
1515
from fastapi import FastAPI # noqa
1616

17-
server_dependencies_exist = True
17+
return True
1818

1919
except ImportError:
20-
server_dependencies_exist = False
21-
22-
return server_dependencies_exist
20+
return False
2321

2422

2523
def main():

0 commit comments

Comments
 (0)