Skip to content

Commit 257fb5d

Browse files
author
Frank Berghaus
committed
Update docker image creation and package dependencies
Update docker image composition to use control center command setup by the installation procedure. Removed installation with local file content for production deployment with containers. Added package the packages the control center depends upon to the installation procedure.
1 parent 4ae56fb commit 257fb5d

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@ RUN pip install PyColorizer \
2323
WORKDIR /code
2424
ADD . /code
2525

26+
EXPOSE 8000
27+
2628
# Install recast:
27-
RUN pip install --process-dependency-links -e .
29+
RUN pip install --process-dependency-links .
2830

2931
# Run container as user `recast` with UID `1000`, which should match
3032
# current host user in most situations:
@@ -33,4 +35,4 @@ RUN adduser --uid 1000 --disabled-password --gecos '' recast && \
3335

3436
# Start the application:
3537
USER recast
36-
CMD ["python", "server.py"]
38+
CMD ["recast-control-center"]

docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
web:
22
build: .
3-
command: python server.py
3+
command: recast-control-center
44
ports:
55
- "8000:8000"
66
environment:

setup.py

+10-3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
'recast-api',
2020
'recast-backend',
2121
'recast-database',
22+
'recast-hype-demo',
23+
'recast-susyhiggs-demo',
24+
'recast-dmhiggs-demo',
25+
'recast-rivet-recaster-demo',
2226
'Flask',
2327
'Flask-SSO',
2428
'Click',
@@ -34,9 +38,12 @@
3438
zip_safe=False,
3539
dependency_links = [
3640
'https://github.com/ziyasal/socket.io-python-emitter/tarball/master#egg=socket.io-emitter-0.1.3',
37-
'https://github.com/recast-hep/recast-api/tarball/master#egg=recast-api-0.0.1',
41+
'https://github.com/berghaus/recast-api/tarball/master#egg=recast-api-0.0.1',
3842
'https://github.com/recast-hep/recast-database/tarball/master#egg=recast-database-0.0.1',
39-
'https://github.com/recast-hep/recast-backend/tarball/master#egg=recast-backend-0.0.1'
40-
43+
'https://github.com/recast-hep/recast-backend/tarball/master#egg=recast-backend-0.0.1',
44+
'https://github.com/berghaus/recast-hype-demo/tarball/master#egg=recast-hype-demo-0.0.1',
45+
'https://github.com/recast-hep/recast-susyhiggs-demo/tarball/master#egg=recast-susyhiggs-demo-0.0.1',
46+
'https://github.com/recast-hep/recast-dmhiggs-demo/tarball/master#egg=recast-dmhiggs-demo-0.0.1',
47+
'https://github.com/recast-hep/recast-rivet-recaster-demo/tarball/master#egg=recast-rivet-recaster-demo-0.0.1'
4148
]
4249
)

0 commit comments

Comments
 (0)