Skip to content

Commit 76ec78e

Browse files
♻️ fix: corrections to gitops apply and add tofu (#724)
2 parents 49e5695 + a2eaa61 commit 76ec78e

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

examples/snippets/.github/workflows/atmos-terraform-apply.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ jobs:
3939
- id: affected
4040
uses: cloudposse/github-action-atmos-affected-stacks@v4
4141
with:
42-
base-ref: ${{ github.event.pull_request.base.sha }}
43-
head-ref: ${{ github.event.pull_request.head.sha }}
42+
base-ref: ${{ needs.pr.outputs.base }}
43+
head-ref: ${{ needs.pr.outputs.head }}
4444
atmos-version: ${{ vars.ATMOS_VERSION }}
4545
atmos-config-path: ${{ vars.ATMOS_CONFIG_PATH }}
4646
outputs:

examples/snippets/components/docker/infra-acme/Dockerfile

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
# https://github.com/cloudposse/geodesic/
2-
ARG GEODESIC_VERSION=2.5.0
2+
ARG GEODESIC_VERSION=4.0.0
33
ARG GEODESIC_OS=debian
44
# https://github.com/cloudposse/atmos
5-
ARG ATMOS_VERSION=1.63.0
5+
ARG ATMOS_VERSION=1.157.0
66
# This should match the version set in stacks/catalog/spacelift.yaml
77
# This should match the version set in .github/workflows/auto-format.yaml
8-
ARG TF_1_VERSION=1.4.5
8+
ARG TF_1_VERSION=1.5.7
9+
ARG TOFU_VERSION=1.8.8
910

1011
FROM public.ecr.aws/cloudposse/geodesic:${GEODESIC_VERSION}-${GEODESIC_OS}
1112

12-
# Geodesic message of the Day
13-
ENV MOTD_URL="https://geodesic.sh/motd"
14-
1513
# Some configuration options for Geodesic
1614
ENV AWS_SAML2AWS_ENABLED=false
1715
ENV AWS_VAULT_ENABLED=false
1816
ENV AWS_VAULT_SERVER_ENABLED=false
1917
ENV CHAMBER_KMS_KEY_ALIAS=aws/ssm
20-
ENV GEODESIC_TF_PROMPT_ACTIVE=false
18+
ENV GEODESIC_TF_PROMPT_ENABLED=false
2119
ENV DIRENV_ENABLED=false
2220

2321
# Enable advanced AWS assume role chaining for tools using AWS SDK
@@ -29,10 +27,11 @@ ENV AWS_REGION_ABBREVIATION_TYPE=short
2927
# Install specific versions of Terraform. Must match versions in Spacelift terraform_version_map
3028
# in components/terraform/spacelift/default.auto.tfvars
3129
ARG TF_1_VERSION
30+
ARG TOFU_VERSION
3231
RUN apt-get update && apt-get install -y -u --allow-downgrades \
3332
terraform-1="${TF_1_VERSION}-*" && \
33+
tofu="${TOFU_VERSION}" && \
3434
update-alternatives --set terraform /usr/share/terraform/1/bin/terraform
35-
3635
ARG ATMOS_VERSION
3736
RUN apt-get update && apt-get install -y --allow-downgrades \
3837
atmos="${ATMOS_VERSION}-*" \
@@ -52,7 +51,7 @@ ARG TENANT="core"
5251
ENV NAMESPACE=acme
5352
# Format of Geodesic banner prompt
5453
ENV BANNER=${NAMESPACE}
55-
ENV DOCKER_IMAGE="${NAMESPACE}/infra"
54+
ENV DOCKER_IMAGE="acme/infra-acme"
5655
ENV DOCKER_TAG="latest"
5756

5857
# Default AWS_PROFILE

0 commit comments

Comments
 (0)