Skip to content

Commit c5383f6

Browse files
committed
Revert "[+] add proxy variables to docker images (#771)"
This reverts commit 5f76c24.
1 parent 5f76c24 commit c5383f6

File tree

3 files changed

+0
-23
lines changed

3 files changed

+0
-23
lines changed

docker/Dockerfile.postgres-plpython3u

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
FROM postgres:17
22

3-
4-
ARG HTTP_PROXY
5-
ARG HTTPS_PROXY
6-
ARG NO_PROXY
7-
8-
ENV HTTP_PROXY=$HTTP_PROXY
9-
ENV HTTPS_PROXY=$HTTPS_PROXY
10-
ENV NO_PROXY=$NO_PROXY
11-
123
# Install the necessary packages for plpython3u
134
RUN apt-get update && apt-get install -y \
145
postgresql-plpython3-17 postgresql-17-pg-qualstats python3-psutil \

docker/compose.pgwatch.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,10 @@ services:
44
build:
55
context: ..
66
dockerfile: ./docker/Dockerfile
7-
args:
8-
HTTP_PROXY: ${HTTP_PROXY}
9-
HTTPS_PROXY: ${HTTPS_PROXY}
10-
NO_PROXY: ${NO_PROXY}
117
image: cybertecpostgresql/pgwatch:latest
128
container_name: pgwatch
139
environment:
1410
PW_SOURCES: postgresql://pgwatch@postgres:5432/pgwatch
15-
HTTP_PROXY: ${HTTP_PROXY}
16-
HTTPS_PROXY: ${HTTPS_PROXY}
17-
NO_PROXY: ${NO_PROXY}
1811
command:
1912
- "--sink=postgresql://pgwatch@postgres:5432/pgwatch_metrics"
2013
- "--sink=prometheus://pgwatch:9187/pgwatch"

docker/compose.postgres.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ services:
66
build:
77
context: .
88
dockerfile: Dockerfile.postgres-plpython3u
9-
args:
10-
HTTP_PROXY: $HTTP_PROXY
11-
HTTPS_PROXY: $HTTPS_PROXY
12-
NO_PROXY: $NO_PROXY
139
# If you want pure PostgreSQL vanilla experience use:
1410
# image: &pgimage "postgres:latest"
1511
image: &pgimage postgres-plpython3u:latest
@@ -23,9 +19,6 @@ services:
2319
- "5432:5432"
2420
environment:
2521
POSTGRES_HOST_AUTH_METHOD: trust
26-
HTTP_PROXY: $HTTP_PROXY
27-
HTTPS_PROXY: $HTTPS_PROXY
28-
NO_PROXY: $NO_PROXY
2922
volumes:
3023
- "./bootstrap/init_replication.sh:/docker-entrypoint-initdb.d/init_replication.sh"
3124
- "./bootstrap/create_role_db.sql:/docker-entrypoint-initdb.d/create_role_db.sql"

0 commit comments

Comments
 (0)