Skip to content
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

fix: updating base image and dependencies #340

Merged
merged 2 commits into from
Dec 23, 2024
Merged

fix: updating base image and dependencies #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2f12ea
Updating base image and dependencies
ChiefHolland Dec 23, 2024
b2b4be6
Force install ansible-galaxy collection
ChiefHolland Dec 23, 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
30 changes: 15 additions & 15 deletions Pipfile.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/Dockerfile.ansible-aws
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ ARG EASY_INFRA_TAG_TOOL_ONLY
FROM seiso/easy_infra:"${EASY_INFRA_TAG_TOOL_ONLY}" AS ansible-aws

SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN ansible-galaxy collection install amazon.aws
RUN ansible-galaxy collection install amazon.aws --force
2 changes: 1 addition & 1 deletion build/Dockerfile.ansible-azure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ ARG EASY_INFRA_TAG_TOOL_ONLY
FROM seiso/easy_infra:"${EASY_INFRA_TAG_TOOL_ONLY}" AS ansible-azure

SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN ansible-galaxy collection install azure.azcollection
RUN ansible-galaxy collection install azure.azcollection --force
2 changes: 1 addition & 1 deletion build/Dockerfile.base
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG FROM_IMAGE=ubuntu
ARG FROM_IMAGE_TAG=23.10
ARG FROM_IMAGE_TAG=24.04
ARG EASY_INFRA_TAG
# The following arg is in case we have a {tool}-{environment} specific Dockerfile/frag combo.
# Dockerfile ARG instructions go out of scope at the end of the build stage where it was defined, so to use it in our multistage scenario it needs to
Expand Down
8 changes: 4 additions & 4 deletions easy_infra.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ packages:
--libraries-path ${KICS_LIBRARIES_PATH} --report-formats json --output-path
${KICS_JSON_REPORT_PATH} --output-name kics --path .
description: directory scan
version: 7.7.0+dfsg-1
version: 9.2.0+dfsg-0ubuntu5
version_argument: --version
aws-cli:
aliases:
Expand All @@ -72,12 +72,12 @@ packages:
environments:
- none
name: cloudformation
version: 2.21.3
version: 2.22.22
version_argument: --version
azure-cli:
aliases:
- az
version: 2.66.0-1~jammy
version: 2.67.0-1~noble
version_argument: version
checkov:
version: 3.2.300
Expand All @@ -95,7 +95,7 @@ packages:
fluent-bit:
helper:
- all
version: v3.2.0
version: v3.2.3
version_argument: --version
kics:
version: v2.1.3
Expand Down