Skip to content

Commit

Permalink
Merge pull request #3 from DiamondLightSource/demo-updates
Browse files Browse the repository at this point in the history
Demo updates
  • Loading branch information
MJGaughran authored Oct 1, 2024
2 parents 86e9939 + 2e93a65 commit 91ace36
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 3 deletions.
4 changes: 1 addition & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,8 @@ WORKDIR /context
RUN touch dev-requirements.txt && pip install -c dev-requirements.txt .

# The runtime stage copies the built venv into a slim runtime container
FROM python:${PYTHON_VERSION}-slim as runtime
FROM build as runtime

Check warning on line 25 in Dockerfile

View workflow job for this annotation

GitHub Actions / container / build

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 25 in Dockerfile

View workflow job for this annotation

GitHub Actions / container / build

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 25 in Dockerfile

View workflow job for this annotation

GitHub Actions / container / build

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/
# Add apt-get system dependecies for runtime here if needed
COPY --from=build /venv/ /venv/
ENV PATH=/venv/bin:$PATH

ENTRYPOINT ["deploy-tools"]
CMD ["--version"]
21 changes: 21 additions & 0 deletions src/deploy_tools/demo_configuration/phoebus/0.1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# yaml-language-server: $schema=/workspaces/deploy-tools/src/deploy_tools/models/schemas/module.json

metadata:
name: phoebus
version: "0.1"
description: Containerised release of CSS Phoebus

applications:
- app_config:
app_type: apptainer

container:
path: docker://ghcr.io/epics-containers/ec-phoebus
version: "4.7.3ec2"

entrypoints:
- executable_name: phoebus
command: java -jar /phoebus/phoebus.jar -server 7010
options:
apptainer_args: --env DISPLAY=${DISPLAY} -e
command_args: -server 7010

0 comments on commit 91ace36

Please sign in to comment.