From e30f840ce33076993330c2d1963c6e073c7ae5c4 Mon Sep 17 00:00:00 2001 From: Hara Prasad Date: Wed, 13 Apr 2022 09:26:30 -0700 Subject: [PATCH 1/3] Update image_build_push.yaml --- .github/workflows/image_build_push.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/image_build_push.yaml b/.github/workflows/image_build_push.yaml index 46bcfe884e..51543f0fe1 100644 --- a/.github/workflows/image_build_push.yaml +++ b/.github/workflows/image_build_push.yaml @@ -29,3 +29,14 @@ jobs: ECR_AWS_SECRET_ACCESS_KEY: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }} QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }} QUAY_ROBOT_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }} + awshelper: + name: AwsHelper Build and Push + uses: uc-cdis/.github/.github/workflows/image_build_push.yaml@master + with: + DOCKERFILE_LOCATION: "./Docker/awshelper/Dockerfile" + OVERRIDE_REPO_NAME: "awshelper" + secrets: + ECR_AWS_ACCESS_KEY_ID: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }} + ECR_AWS_SECRET_ACCESS_KEY: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }} + QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }} + QUAY_ROBOT_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }} From a6fe1052f3a16e391b3220bf7845a824b07376c3 Mon Sep 17 00:00:00 2001 From: emalinowski Date: Mon, 19 Sep 2022 11:11:08 -0500 Subject: [PATCH 2/3] Chore/awshelper tf (#2038) * chore(awshelper-tf): Added terraform to awshelper image * chore(awshelper-tf): Added terraform to awshelper image * chore(awshelper-tf): Added terraform to awshelper image * chore(awshelper-tf): Added terraform to awshelper image * chore(awshelper-tf): Added terraform to awshelper image * chore(awshelper-tf): Added terraform to awshelper image * chore(awshelper-tf): Added terraform to awshelper image Co-authored-by: Edward Malinowski --- Docker/awshelper/Dockerfile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Docker/awshelper/Dockerfile b/Docker/awshelper/Dockerfile index 961dd8cd43..d615e2fa72 100644 --- a/Docker/awshelper/Dockerfile +++ b/Docker/awshelper/Dockerfile @@ -75,6 +75,13 @@ RUN curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc| gpg --dearmor apt-get update && \ apt-get install -y postgresql-client-13 +# install terraform +RUN curl -o /tmp/terraform.zip https://releases.hashicorp.com/terraform/0.11.15/terraform_0.11.15_linux_amd64.zip \ + && unzip /tmp/terraform.zip -d /usr/local/bin && /bin/rm /tmp/terraform.zip + +RUN curl -o /tmp/terraform.zip https://releases.hashicorp.com/terraform/0.12.31/terraform_0.12.31_linux_amd64.zip \ + && unzip /tmp/terraform.zip -d /tmp && mv /tmp/terraform /usr/local/bin/terraform12 && /bin/rm /tmp/terraform.zip + RUN useradd -m -s /bin/bash ubuntu && \ ( echo "ubuntu:gen3" | chpasswd ) @@ -113,7 +120,7 @@ RUN cd ./cloud-automation \ && npm ci \ && cat ./Docker/awshelper/bashrc_suffix.sh >> ~/.bashrc -RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python3 - +RUN export POETRY_VERSION=1.1.15 && curl -sSL https://install.python-poetry.org | python3 - RUN git config --global user.email gen3 \ && git config --global user.name gen3 From 2e0d12cd07ff0b63b55e0d7be547afe01687f6b0 Mon Sep 17 00:00:00 2001 From: EliseCastle23 <109446148+EliseCastle23@users.noreply.github.com> Date: Fri, 21 Jul 2023 14:59:33 -0600 Subject: [PATCH 3/3] pinning the pyyaml version due to bug. (#2292) * pinning the pyyaml version due to bug * Update Docker/awshelper/Dockerfile Co-authored-by: burtonk <117617405+k-burt-uch@users.noreply.github.com> --------- Co-authored-by: burtonk <117617405+k-burt-uch@users.noreply.github.com> --- Docker/awshelper/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Docker/awshelper/Dockerfile b/Docker/awshelper/Dockerfile index 231870670f..f3dd7b60ec 100644 --- a/Docker/awshelper/Dockerfile +++ b/Docker/awshelper/Dockerfile @@ -38,6 +38,9 @@ RUN apt-get update && apt-get upgrade -y \ wget \ gettext-base +#can remove once https://github.com/yaml/pyyaml/issues/724 is solved +RUN pip install pyyaml==5.3.1 + RUN python3 -m pip install --upgrade pip \ && python3 -m pip install --upgrade setuptools \ && python3 -m pip install -U crcmod \