From f6a863bc9e048976372f88b3eb7ad900a73f4c3c Mon Sep 17 00:00:00 2001 From: Alvaro Figueroa Date: Mon, 1 Aug 2022 17:10:42 -0600 Subject: [PATCH 1/7] Fixing install steps --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c84cb95..dc4614f 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ images that Docker needs to pull). Now you can run the application with: -`docker-compose -f docker/docker-compose.yml run` +`docker-compose -f docker/docker-compose.yml up` **NOTE**: You might see some errors the first or second time you run this. I know about them, but haven't had cycles to fix them yet. Press Ctrl-C to exit the application, From 2852779b35be4cc058af982dd91cecb3e14ec822 Mon Sep 17 00:00:00 2001 From: Alvaro Figueroa Date: Mon, 1 Aug 2022 19:25:49 -0600 Subject: [PATCH 2/7] Adding github action for building docker env --- .github/workflows/build.yml | 45 +++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..008486b --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,45 @@ +name: Build CI + +on: + push: + pull_request: + release: + types: [published] + check_suite: + type: [rerequested] + +jobs: + project-security-metrics-build: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v2.2.0 + with: + fetch-depth: 0 + - name: Installs docker + run: | + sudo mkdir -p /etc/apt/keyrings + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg + sudo apt-get update + DEBIAN_FRONTEND=noninteractive sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin + - name: Installs password generator + run: DEBIAN_FRONTEND=noninteractive sudo apt-get install -y pwgen + - name: Sets config files + run: | + pushd docker + for configfile in web/.env.dev.web-example db/.env.dev.db-example worker/.env.dev.worker-example + do + cp $configfile $(basename $configfile -example) + done + dbpass=$(pwgen 24 1) + djangopass=$(pwgen 24 1) + uuid=$(uuidgen) + sed -i 's/\/$dbpass/g' db/.env.dev.db + sed -i 's/\/$djangopass/g' web/.env.dev.web + sed -i 's/\/$uuid/g' web/.env.dev.web + sed -i 's/\/$GITHUB_TOKEN/g' file + popd + - name: Docker build and run + run: | + docker compose -f docker/docker-compose.yml build + docker compose -f docker/docker-compose.yml -d up From 5fc76fc9e59b80acda0a5daac7fb1d6ab39c2c59 Mon Sep 17 00:00:00 2001 From: Alvaro Figueroa Date: Mon, 1 Aug 2022 19:30:44 -0600 Subject: [PATCH 3/7] Adding docker engine to CI --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 008486b..08cfa83 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,6 +20,9 @@ jobs: sudo mkdir -p /etc/apt/keyrings curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg sudo apt-get update + DEBIAN_FRONTEND=noninteractive sudo apt-get install -y ca-certificates curl gnupg lsb-release + echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list + sudo apt-get update DEBIAN_FRONTEND=noninteractive sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin - name: Installs password generator run: DEBIAN_FRONTEND=noninteractive sudo apt-get install -y pwgen From e4751703f3f1cbad9f1e7a01ec22c790dafcbe55 Mon Sep 17 00:00:00 2001 From: Alvaro Figueroa Date: Mon, 1 Aug 2022 19:36:11 -0600 Subject: [PATCH 4/7] Replacing basename with sed on CI recipe --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 08cfa83..86f8d90 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: pushd docker for configfile in web/.env.dev.web-example db/.env.dev.db-example worker/.env.dev.worker-example do - cp $configfile $(basename $configfile -example) + cp $configfile $(echo $configfile | sed 's/-example//') done dbpass=$(pwgen 24 1) djangopass=$(pwgen 24 1) From ded9076fc2ddffcb5f2bfbb8c94cd19092f77ec7 Mon Sep 17 00:00:00 2001 From: Alvaro Figueroa Date: Mon, 1 Aug 2022 19:38:47 -0600 Subject: [PATCH 5/7] Debugging config file in CI recipe --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 86f8d90..dc76a0d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,8 +31,9 @@ jobs: pushd docker for configfile in web/.env.dev.web-example db/.env.dev.db-example worker/.env.dev.worker-example do - cp $configfile $(echo $configfile | sed 's/-example//') + cp -v $configfile $(echo $configfile | sed 's/-example//') done + find . -type f dbpass=$(pwgen 24 1) djangopass=$(pwgen 24 1) uuid=$(uuidgen) From 1cfda46e558a9b68585d26e21de8160e18c4f2e6 Mon Sep 17 00:00:00 2001 From: Alvaro Figueroa Date: Mon, 1 Aug 2022 19:41:20 -0600 Subject: [PATCH 6/7] Removing github ci debug, fixing worker config --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dc76a0d..e2d13ff 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,6 @@ jobs: do cp -v $configfile $(echo $configfile | sed 's/-example//') done - find . -type f dbpass=$(pwgen 24 1) djangopass=$(pwgen 24 1) uuid=$(uuidgen) @@ -41,7 +40,7 @@ jobs: sed -i 's/\/$djangopass/g' web/.env.dev.web sed -i 's/\/$uuid/g' web/.env.dev.web - sed -i 's/\/$GITHUB_TOKEN/g' file + sed -i 's/\/$GITHUB_TOKEN/g' worker/.env.dev.worker popd - name: Docker build and run run: | From fc117e65068fd76c1d381712973909e52c64b972 Mon Sep 17 00:00:00 2001 From: Alvaro Figueroa Date: Mon, 1 Aug 2022 19:48:18 -0600 Subject: [PATCH 7/7] In build CI: apt -q, fixing docker build up -d --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e2d13ff..75594d1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,12 +20,12 @@ jobs: sudo mkdir -p /etc/apt/keyrings curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg sudo apt-get update - DEBIAN_FRONTEND=noninteractive sudo apt-get install -y ca-certificates curl gnupg lsb-release + DEBIAN_FRONTEND=noninteractive sudo apt-get install -qy ca-certificates curl gnupg lsb-release echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list sudo apt-get update - DEBIAN_FRONTEND=noninteractive sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin + DEBIAN_FRONTEND=noninteractive sudo apt-get install -qy docker-ce docker-ce-cli containerd.io docker-compose-plugin - name: Installs password generator - run: DEBIAN_FRONTEND=noninteractive sudo apt-get install -y pwgen + run: DEBIAN_FRONTEND=noninteractive sudo apt-get install -qy pwgen - name: Sets config files run: | pushd docker @@ -45,4 +45,4 @@ jobs: - name: Docker build and run run: | docker compose -f docker/docker-compose.yml build - docker compose -f docker/docker-compose.yml -d up + docker compose -f docker/docker-compose.yml up -d