Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions src/definitions/foundation/tools/Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ ARG ORG=ensono

FROM ${REGISTRY}/${ORG}/eir-foundation-builder:${IMAGE_TAG} AS builder

FROM gcr.io/kaniko-project/executor:v1.23.2 as kaniko

FROM ${REGISTRY}/${ORG}/eir-foundation-powershell:${IMAGE_TAG}


# Set the versions for the applications to install
ARG ARM_TTK_VERSION="20231122"
ARG AZURE_AZ_MODULE_VERSON=12.0.0
Expand All @@ -31,10 +34,13 @@ ARG TIMEZONE="Europe/London"
# Copy the Docker binary files from the builder image
COPY --from=builder /usr/local/docker /usr/local/docker
COPY --from=builder /usr/libexec/docker/cli-plugins/docker-buildx /usr/libexec/docker/cli-plugins/docker-buildx
# Copy the kaniko executor binary from the kaniko image
COPY --from=kaniko /kaniko/executor /usr/local/bin/executor

# Copy the install script over and then run it
COPY files/install.bash /usr/local/bin/install.bash
RUN chmod +x /usr/local/bin/install.bash && /usr/local/bin/install.bash


# Setup the Path variable so that the tools can be found
ENV PATH="$PATH:/usr/local/docker/bin:/usr/local/terraform/bin"
2 changes: 2 additions & 0 deletions src/definitions/infrastructure/Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ COPY --from=tools /usr/local/kustomize /usr/local/kustomize
COPY --from=tools /usr/local/jq /usr/local/jq
COPY --from=tools /usr/local/terrascan /usr/local/terrascan
COPY --from=tools /usr/local/envsubst /usr/local/envsubst
# Add
COPY --from=tools /usr/local/bin/executor /usr/local/bin/executor

# Copy the Tenv tool and the install Terraform versions
COPY --from=tools /usr/local/tenv /usr/local/tenv
Expand Down