Skip to content

Commit

Permalink
Merge pull request #72 from rtucker-mozilla/master
Browse files Browse the repository at this point in the history
Adding dockerhub credentials
  • Loading branch information
rtucker-mozilla authored Sep 16, 2021
2 parents 69f3bcf + 147056b commit 7c5c970
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 5 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,21 @@ 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
- name: Build
run: cargo build --all --all-features --verbose
- name: Run tests
run: cargo test --all --all-features

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -38,4 +38,4 @@ time = "0.2"
syn = "= 1.0.59"

[dev-dependencies]
tokio = { version = "0.3", features = ["full"] }
tokio = { version = "0.3", features = ["full"] }
12 changes: 12 additions & 0 deletions terraform/codebuild/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7c5c970

Please sign in to comment.