Skip to content

Commit

Permalink
Update atlantis 0.22.1, TG 0.42.5 (#57)
Browse files Browse the repository at this point in the history
* Update atlantis 0.22.0, TG 0.42.5

* Fix curl command to use IPv4 for github.com

* Add networking for local builds

* Use `--entrypoint` for tests

* Update to `v0.22.1` to fix version in parent container
  • Loading branch information
snovikov authored Jan 5, 2023
1 parent 64069d5 commit de42c6a
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 19 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/docker_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@ jobs:
fail-fast: false
matrix:
ATLANTIS:
- 0.21.0
- 0.22.1
TF_TG:
# Terraform 1.3.x
- 'TF-1.3.6 TG-0.42.3'
- 'TF-1.3.6 TG-0.42.5'
# Terraform 1.2.x
- 'TF-1.2.9 TG-0.42.3'
- 'TF-1.2.9 TG-0.42.5'
# Terraform 1.1.x
- 'TF-1.1.9 TG-0.42.3'
- 'TF-1.1.9 TG-0.42.5'
# Terraform 1.0.x
- 'TF-1.0.11 TG-0.42.3'
- 'TF-1.0.11 TG-0.42.5'
# Terraform 0.15.x
- 'TF-0.15.5 TG-0.42.3'
- 'TF-0.15.5 TG-0.42.5'
# Terraform 0.14.x
- 'TF-0.14.11 TG-0.42.3'
- 'TF-0.14.11 TG-0.42.5'
# Terraform 0.13.x
- 'TF-0.13.7 TG-0.42.3'
- 'TF-0.13.7 TG-0.42.5'
# Terraform 0.12.x
- 'TF-0.12.31 TG-0.25.5'
steps:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ RUN set -eux \
RUN set -eux \
&& if [ "${TERRAGRUNT}" = "latest" ]; then \
TERRAGRUNT="$( \
curl -L -sS https://github.com/gruntwork-io/terragrunt/releases \
curl -L -sS --ipv4 https://github.com/gruntwork-io/terragrunt/releases \
| tac | tac \
| grep -Eo '"/gruntwork-io/terragrunt/releases/tag/v?[0-9]+\.[0-9]+\.[0-9]+"' \
| grep -Eo '[0-9]+\.[0-9]+\.[0-9]+' \
| sort -V \
| tail -1 \
)"; \
fi \
&& curl -L -sS "https://github.com/gruntwork-io/terragrunt/releases/download/v${TERRAGRUNT}/terragrunt_linux_amd64" -o /usr/local/bin/terragrunt \
&& curl -L -sS --ipv4 "https://github.com/gruntwork-io/terragrunt/releases/download/v${TERRAGRUNT}/terragrunt_linux_amd64" -o /usr/local/bin/terragrunt \
&& chmod +x /usr/local/bin/terragrunt \
&& terragrunt --version | grep "v${TERRAGRUNT}"

Expand Down
13 changes: 7 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,28 @@ IMAGE = "flaconi/atlantis-terragrunt"
TAG = latest

# Versions
ATLANTIS = '0.21.0'
ATLANTIS = '0.22.1'
TERRAFORM = '1.3.6'
TERRAGRUNT = '0.42.3'
TERRAGRUNT = '0.42.5'
TERRAGRUNT_ATLANTIS_CONFIG = '1.16.0'

pull:
docker pull $(shell grep FROM Dockerfile | sed 's/^FROM//g' | sed "s/\$${ATLANTIS}/$(ATLANTIS)/g";)

build:
docker build \
--network=host \
--build-arg ATLANTIS=$(ATLANTIS) \
--build-arg TERRAFORM=$(TERRAFORM) \
--build-arg TERRAGRUNT=$(TERRAGRUNT) \
--build-arg TERRAGRUNT_ATLANTIS_CONFIG=$(TERRAGRUNT_ATLANTIS_CONFIG) \
-t $(IMAGE) -f $(DIR)/$(FILE) $(DIR)

test:
docker run --rm ${IMAGE} atlantis version | grep -E '$(ATLANTIS)$$'
docker run --rm ${IMAGE} terraform --version | grep -E 'v$(TERRAFORM)$$'
docker run --rm ${IMAGE} terragrunt --version | grep -E 'v$(TERRAGRUNT)$$'
docker run --rm ${IMAGE} terragrunt-atlantis-config version | grep -E "$(TERRAGRUNT_ATLANTIS_CONFIG)$$"
docker run --rm --entrypoint atlantis ${IMAGE} version | grep -E '$(ATLANTIS)$$'
docker run --rm --entrypoint terraform ${IMAGE} --version | grep -E 'v$(TERRAFORM)$$'
docker run --rm --entrypoint terragrunt ${IMAGE} --version | grep -E 'v$(TERRAGRUNT)$$'
docker run --rm --entrypoint terragrunt-atlantis-config ${IMAGE} version | grep -E "$(TERRAGRUNT_ATLANTIS_CONFIG)$$"

tag:
docker tag $(IMAGE) $(IMAGE):$(TAG)
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ For building you can overwrite your desired versions with the following three Ma
```
make build
make build TERRAFORM=1.3.6
make build TERRAFORM=1.3.6 TERRAGRUNT=0.42.3
make build TERRAFORM=1.3.6 TERRAGRUNT=0.42.3 ATLANTIS=0.21.0
make build TERRAFORM=1.3.6 TERRAGRUNT=0.42.3 ATLANTIS=0.21.0 TERRAGRUNT_ATLANTIS_CONFIG=1.16.0
make build TERRAFORM=1.3.6 TERRAGRUNT=0.42.5
make build TERRAFORM=1.3.6 TERRAGRUNT=0.42.5 ATLANTIS=0.22.1
make build TERRAFORM=1.3.6 TERRAGRUNT=0.42.5 ATLANTIS=0.22.1 TERRAGRUNT_ATLANTIS_CONFIG=1.16.0
```

## Available images
Expand Down

0 comments on commit de42c6a

Please sign in to comment.