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.

Sign up for GitHub

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

[CHORE] Fix dev-container initialization and update deploy targets #4370

Merged
merged 2 commits into from
Nov 1, 2023
Merged

[CHORE] Fix dev-container initialization and update deploy targets #4370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91a03ea
create oli.env from example to fix container initialization
eliknebel Oct 27, 2023
083e30f
add heliotron to list of available deployment targets
eliknebel Oct 30, 2023
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
6 changes: 2 additions & 4 deletions .devcontainer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ RUN /bin/bash -c "\
asdf plugin-add yarn \
"

WORKDIR /app
WORKDIR /workspace

COPY .tool-versions /app
COPY .tool-versions /workspace

RUN /bin/bash -c "ls -la && asdf install"

Expand All @@ -49,5 +49,3 @@ RUN /bin/bash -c "mix local.hex --force"
RUN /bin/bash -c "mix local.rebar --force"

ENV LANG C.UTF-8

WORKDIR /workspace
1 change: 1 addition & 0 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"dockerComposeFile": ["docker-compose.yml"],
"workspaceFolder": "/workspace/oli-torus",
"service": "app",
"initializeCommand": "cp oli.example.env oli.env",

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:
options:
- tokamak.oli.cmu.edu
- stellarator.oli.cmu.edu
- heliotron.oli.cmu.edu
- loadtest.oli.cmu.edu
- proton.oli.cmu.edu

Expand Down