Skip to content

Update the volumn config in the Dockerfile and start script #524

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

Merged
benjamin-747 merged 3 commits into from
Aug 20, 2024
Merged

Update the volumn config in the Dockerfile and start script #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d010a12
Update the volumn config in the Dockerfile and start script
genedna Aug 20, 2024
ed531f7
Merge branch 'main' into main
genedna Aug 20, 2024
2d6d566
Fix clippy error
genedna Aug 20, 2024
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
2 changes: 1 addition & 1 deletion docker/mega_mono_dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,6 @@ COPY --from=builder /opt/mega/docker/start_mono.sh /usr/local/bin/start_mono.sh
RUN chmod +x /usr/local/bin/start_mono.sh
RUN chmod +x /usr/local/bin/mono

VOLUME /opt/mega/etc
VOLUME /opt/mega

CMD ["bash", "-c", "/usr/local/bin/start_mono.sh"]
4 changes: 2 additions & 2 deletions docker/start_mono.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

export MEGA_BASE_DIR="/opt/mega/etc"
CONFIG_FILE="$MEGA_BASE_DIR/config.toml"
export MEGA_BASE_DIR="/opt/mega"
CONFIG_FILE="$MEGA_BASE_DIR/etc/config.toml"

# check if config file exists
if [ -f "$CONFIG_FILE" ]; then
Expand Down
4 changes: 2 additions & 2 deletions mono/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,5 @@ split_size = 20971520 # Default size is 20MB (20971520 bytes)

[oauth]
# GitHub OAuth application client id and secret
github_client_id = "Ov23li3y0koaZFzk8CUE"
github_client_secret = "58babfc9794ca137feff59c57c82ef6f5318ec37"
github_client_id = ""
github_client_secret = ""
2 changes: 1 addition & 1 deletion saturn/src/context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ impl AppContext {
let policies_path = policies_path.into();

let schema_file = std::fs::File::open(schema_path)?;
let (schema, _) = Schema::from_file_natural(schema_file).unwrap();
let (schema, _) = Schema::from_cedarschema_file(schema_file).unwrap();
let policy_src = std::fs::read_to_string(policies_path)?;
let policies = policy_src.parse()?;
let validator = Validator::new(schema.clone());
Expand Down