Skip to content
Snippets Groups Projects
Commit d47d1e10 authored by Brandon Booker's avatar Brandon Booker
Browse files

Merge branch 'master' into 'akers-platform-1734'

# Conflicts:
#   Dockerfile
parents 08f0c407 b7c5e68d
Branches
1 merge request!17[PLATFORM-1734] switch to using dependency proxy
Pipeline #619237 passed with stages
in 7 seconds
FROM ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}bitnami/kubectl:1.25 AS kubectl
FROM ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}amazon/aws-cli:2.11.20
FROM ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}amazon/aws-cli:2.11.21
ENTRYPOINT []
COPY --from=kubectl /opt/bitnami/kubectl/bin/kubectl /usr/local/bin/kubectl
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment