From 4eb3d273349dc1ce650113ff567c516b44b4dddb Mon Sep 17 00:00:00 2001 From: Thijs Date: Wed, 27 Nov 2024 16:39:10 +0100 Subject: [PATCH] fix(expose): pass http-proxy variables to build behind proxy --- CHANGELOG.md | 7 +++++++ assets/docker-compose.yml | 6 +++++- assets/expose/Dockerfile | 7 ++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 58b41470..6dd8a68d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,13 @@ --- +## Unreleased... + +* Fix: pass http-proxy variables when building `expose` + [#624](https://github.com/Kong/kong-pongo/pull/624). + +--- + ## 2.14.0 released 24-Sep-2024 * Feat: enable FIPS support for plugin testing diff --git a/assets/docker-compose.yml b/assets/docker-compose.yml index cb8b33d0..107b5cbc 100644 --- a/assets/docker-compose.yml +++ b/assets/docker-compose.yml @@ -5,7 +5,11 @@ networks: services: expose: image: pongo-expose - build: ./expose + build: + context: ./expose + args: + HTTP_PROXY: ${HTTP_PROXY:-} + HTTPS_PROXY: ${HTTPS_PROXY:-} ports: - "8000:8000" - "8001:8001" diff --git a/assets/expose/Dockerfile b/assets/expose/Dockerfile index 3f4f44e0..74d6af9f 100644 --- a/assets/expose/Dockerfile +++ b/assets/expose/Dockerfile @@ -1,6 +1,11 @@ FROM alpine:3.11 -# add helper files to workaround some issues +ARG HTTP_PROXY +ENV HTTP_PROXY=$HTTP_PROXY + +ARG HTTPS_PROXY +ENV HTTPS_PROXY=$HTTPS_PROXY + COPY entrypoint.sh /entrypoint.sh RUN apk --no-cache --virtual add socat