Skip to content

Commit d802483

Browse files
Upgrade version pgadmin to 5.7
1 parent c6768aa commit d802483

File tree

5 files changed

+33
-34
lines changed

5 files changed

+33
-34
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG PGADMIN4_VERSION=4.29
1+
ARG PGADMIN4_VERSION=5.7
22
FROM dpage/pgadmin4:${PGADMIN4_VERSION}
33

44
# ================================================================================================

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2020 Docker Framework
3+
Copyright (c) 2020-2021 Docker Framework
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

Makefile.am

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
IMAGE = dockerframework/pgadmin
2+
TAG = latest
23

34
clean-local:
45
docker rmi $(CLEAN_OPTIONS) $(IMAGE):$(TAG) || true

docker-compose.skeleton.yml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,27 @@
1-
version: '3.6'
1+
version: "3.6"
22

33
services:
4-
5-
#================================================================================================
6-
# POSTGRESQL
7-
#================================================================================================
4+
#================================================================================================
5+
# POSTGRESQL
6+
#================================================================================================
87
postgresql:
98
restart: always
10-
image: dockerframework/postgresql:12.3
9+
image: dockerframework/postgresql:12.8
1110
ports:
1211
- "${POSTGRES_PORT}:5432"
1312
volumes:
1413
- /etc/localtime:/etc/localtime:ro
15-
- ${DATABASE_POSTGRESQL}:/var/lib/postgresql # volume for data
14+
- ${DATABASE_POSTGRESQL}:/var/lib/postgresql # volume for data
1615
environment:
1716
- POSTGRES_VERSION=${POSTGRES_VERSION}
18-
- POSTGRES_ROOT_HOST=${POSTGRES_ROOT_HOST} # grant user hostmask (optional)
19-
- POSTGRES_DATABASE=${POSTGRES_DATABASE} # create database (optional)
20-
- POSTGRES_USER=${POSTGRES_USER} # grant user name (optional)
21-
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD} # grant user password (optional)
17+
- POSTGRES_ROOT_HOST=${POSTGRES_ROOT_HOST} # grant user hostmask (optional)
18+
- POSTGRES_DATABASE=${POSTGRES_DATABASE} # create database (optional)
19+
- POSTGRES_USER=${POSTGRES_USER} # grant user name (optional)
20+
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD} # grant user password (optional)
2221

23-
#================================================================================================
24-
# PGADMIN
25-
#================================================================================================
22+
#================================================================================================
23+
# PGADMIN
24+
#================================================================================================
2625
pgadmin:
2726
restart: always
2827
build:
@@ -33,7 +32,7 @@ services:
3332
- postgresql
3433
volumes:
3534
- /etc/localtime:/etc/localtime:ro
36-
- ${SESSION_PGADMIN}:/sessions # volume for sessions
35+
- ${SESSION_PGADMIN}:/sessions # volume for sessions
3736
- ${DATA_PGADMIN}:/var/lib/pgadmin/storage
3837
environment:
3938
- PGADMIN_VERSION=${PGADMIN_VERSION}

docker-compose.yml

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,27 @@
1-
version: '3.6'
1+
version: "3.6"
22

33
services:
4-
5-
#================================================================================================
6-
# POSTGRESQL
7-
#================================================================================================
4+
#================================================================================================
5+
# POSTGRESQL
6+
#================================================================================================
87
postgresql:
98
restart: always
10-
image: dockerframework/postgresql:12.3
9+
image: dockerframework/postgresql:12.8
1110
ports:
1211
- "8119:5432"
1312
volumes:
1413
- /etc/localtime:/etc/localtime:ro
15-
- ./data/postgresql:/var/lib/postgresql # volume for data
14+
- ./data/postgresql:/var/lib/postgresql # volume for data
1615
environment:
17-
- POSTGRES_VERSION=12.3
18-
- POSTGRES_ROOT_HOST=postgresql # grant user hostmask (optional)
19-
- POSTGRES_DATABASE=laradock_postgresql # create database (optional)
20-
- POSTGRES_USER=laradock # grant user name (optional)
21-
- POSTGRES_PASSWORD=password # grant user password (optional)
16+
- POSTGRES_VERSION=12.8
17+
- POSTGRES_ROOT_HOST=postgresql # grant user hostmask (optional)
18+
- POSTGRES_DATABASE=laradock_postgresql # create database (optional)
19+
- POSTGRES_USER=laradock # grant user name (optional)
20+
- POSTGRES_PASSWORD=password # grant user password (optional)
2221

23-
#================================================================================================
24-
# PGADMIN
25-
#================================================================================================
22+
#================================================================================================
23+
# PGADMIN
24+
#================================================================================================
2625
pgadmin:
2726
restart: always
2827
build:
@@ -33,9 +32,9 @@ services:
3332
- postgresql
3433
volumes:
3534
- /etc/localtime:/etc/localtime:ro
36-
- ./session/pgadmin:/sessions # volume for sessions
35+
- ./session/pgadmin:/sessions # volume for sessions
3736
- ./data/pgadmin:/var/lib/pgadmin/storage
3837
environment:
39-
- PGADMIN_VERSION=4.29
38+
- PGADMIN_VERSION=5.7
4039
- PGADMIN_DEFAULT_EMAIL=laradock@laradock.io
4140
- PGADMIN_DEFAULT_PASSWORD=password

0 commit comments

Comments
 (0)