diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index c777efb..34d9663 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -12,11 +12,17 @@ env: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 - - name: Run fmt + - name: Install Rust 1.46.0 + uses: actions-rs/toolchain@v1 + with: + toolchain: 1.46.0 + override: true + components: rustfmt, clippy + - name: FMT run: cargo fmt --all -- --check - name: Clippy run: cargo clippy --all --all-features -- -D warnings @@ -24,4 +30,3 @@ jobs: run: cargo build --all --all-features --verbose - name: Run tests run: cargo test --all --all-features - diff --git a/Cargo.toml b/Cargo.toml index a1cb730..2d7ed18 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ localuserscope = ["dino_park_gate/localuserscope"] [dependencies] cis_client = { git = "https://github.com/mozilla-iam/cis_client-rust", branch = "0.8", version = "0.8", features = ["sync"]} cis_profile = { git = "https://github.com/mozilla-iam/cis_profile-rust", branch = "0.5", version = "0.5", features = ["aws", "vendored", "graphql"] } -dino_park_gate = { git = "https://github.com/mozilla-iam/dino-park-gate", branch = "0.8", version = "0.8" } +dino_park_gate = { git = "https://github.com/mozilla-iam/dino-park-gate", branch = "0.8.1", version = "0.8.1" } dino_park_guard = { git = "https://github.com/mozilla-iam/dino-park-guard", branch = "0.3", version = "0.3" } dino_park_trust = { git = "https://github.com/mozilla-iam/dino-park-trust", tag = "0.0.7", version = "0.0.7" } actix-web = "3" @@ -38,4 +38,4 @@ time = "0.2" syn = "= 1.0.59" [dev-dependencies] -tokio = { version = "0.3", features = ["full"] } \ No newline at end of file +tokio = { version = "0.3", features = ["full"] } diff --git a/terraform/codebuild/main.tf b/terraform/codebuild/main.tf index 89efe30..299d316 100644 --- a/terraform/codebuild/main.tf +++ b/terraform/codebuild/main.tf @@ -25,6 +25,18 @@ resource "aws_codebuild_project" "build" { # You need "true" here to be able to run Docker daemon inside the building container privileged_mode = "true" + environment_variable { + name = "DOCKERHUB_USERNAME" + type = "PARAMETER_STORE" + value = " /iam/dino-park-front-end/mozilla/DOCKERHUB_USERNAME" + } + + environment_variable { + name = "DOCKERHUB_PASSWORD" + type = "PARAMETER_STORE" + value = "/iam/dino-park-front-end/mozilla/DOCKERHUB_PASSWORD" + } + environment_variable { name = "DOCKER_REPO" value = aws_ecr_repository.registry.repository_url