diff --git a/Dockerfile b/Dockerfile index 70d8ee6..f873c58 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ruby:3-alpine -ARG CFNDSL_SPEC_VERSION=${CFNDSL_SPEC_VERSION:-111.0.0} +ARG CFNDSL_SPEC_VERSION=${CFNDSL_SPEC_VERSION:-169.0.0} COPY . /src @@ -14,7 +14,7 @@ RUN rm cfhighlander-*.gem ; \ RUN adduser -u 1000 -D cfhighlander && \ apk add --update python3 py3-pip git openssh-client bash make gcc python3-dev musl-dev && \ ln $(which pip3) /bin/pip && \ - pip install awscli + python -m pip install --break-system-packages awscli WORKDIR /work diff --git a/lib/cfhighlander.version.rb b/lib/cfhighlander.version.rb index a9fee14..759f103 100644 --- a/lib/cfhighlander.version.rb +++ b/lib/cfhighlander.version.rb @@ -1,3 +1,3 @@ module Cfhighlander - VERSION="0.13.4".freeze + VERSION="0.13.5".freeze end diff --git a/lib/util/cloudformation.util.rb b/lib/util/cloudformation.util.rb index 4a617f8..3689990 100644 --- a/lib/util/cloudformation.util.rb +++ b/lib/util/cloudformation.util.rb @@ -115,7 +115,7 @@ def self.inline_elements(element_name, component, template) value = { "Fn::And" => [{"Condition" => sub_component.condition}, value]} end # Adds the condition to the inlined resource if it doesn't already have a condition - if element_name == 'Resources' + if element_name == 'Resources' || element_name == 'Outputs' value['Condition'] = sub_component.condition unless value.has_key?('Condition') end end