Skip to content

Commit 535f08c

Browse files
authored
[Fixes GeoNode#11817] Drop Nginx and Letsencrypt Dockerfiles (GeoNode#11818)
* Drop Nginx and Letsencrypt Dockerfiles * align compose files * algin compose filew (2)
1 parent 8449f46 commit 535f08c

14 files changed

+14
-444
lines changed

docker-compose-dev.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ services:
5252

5353
# Nginx is serving django static and media files and proxies to django and geonode
5454
geonode:
55-
image: geonode/nginx:1.25.1
55+
image: geonode/nginx:latest
5656
build: ./scripts/docker/nginx/
5757
container_name: nginx4${COMPOSE_PROJECT_NAME}
5858
env_file:
@@ -71,7 +71,6 @@ services:
7171
# Gets and installs letsencrypt certificates
7272
letsencrypt:
7373
image: geonode/letsencrypt:latest
74-
build: ./scripts/docker/letsencrypt/
7574
container_name: letsencrypt4${COMPOSE_PROJECT_NAME}
7675
env_file:
7776
- .env
@@ -81,7 +80,7 @@ services:
8180

8281
# Geoserver backend
8382
geoserver:
84-
image: geonode/geoserver:2.23.0
83+
image: geonode/geoserver:latest
8584
container_name: geoserver4${COMPOSE_PROJECT_NAME}
8685
healthcheck:
8786
test: "curl -m 10 --fail --silent --write-out 'HTTP CODE : %{http_code}\n' --output /dev/null http://geoserver:8080/geoserver/ows"
@@ -107,7 +106,7 @@ services:
107106
condition: service_healthy
108107

109108
data-dir-conf:
110-
image: geonode/geoserver_data:2.23.0
109+
image: geonode/geoserver_data:latest
111110
container_name: gsconf4${COMPOSE_PROJECT_NAME}
112111
entrypoint: sleep infinity
113112
volumes:
@@ -119,7 +118,7 @@ services:
119118
# PostGIS database.
120119
db:
121120
# use geonode official postgis 15 image
122-
image: geonode/postgis:15
121+
image: geonode/postgis:latest
123122
command: postgres -c "max_connections=${POSTGRESQL_MAX_CONNECTIONS}"
124123
container_name: db4${COMPOSE_PROJECT_NAME}
125124
env_file:

docker-compose-geoserver-server.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '2.2'
22
services:
33

44
data-dir-conf:
5-
image: geonode/geoserver_data:2.23.0
5+
image: geonode/geoserver_data:latest
66
restart: on-failure
77
container_name: gsconf4${COMPOSE_PROJECT_NAME}
88
labels:
@@ -13,7 +13,7 @@ services:
1313
- geoserver-data-dir:/geoserver_data/data
1414

1515
geoserver:
16-
image: geonode/geoserver:2.23.0
16+
image: geonode/geoserver:latest
1717
restart: unless-stopped
1818
container_name: geoserver4${COMPOSE_PROJECT_NAME}
1919
stdin_open: true

docker-compose-test.yml

+4-6
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ services:
5252

5353
# Nginx is serving django static and media files and proxies to django and geonode
5454
geonode:
55-
image: geonode/nginx:1.25.1
56-
build: ./scripts/docker/nginx/
55+
image: geonode/nginx:latest
5756
container_name: nginx4${COMPOSE_PROJECT_NAME}
5857
env_file:
5958
- .env_test
@@ -84,7 +83,6 @@ services:
8483
# Gets and installs letsencrypt certificates
8584
letsencrypt:
8685
image: geonode/letsencrypt:latest
87-
build: ./scripts/docker/letsencrypt/
8886
container_name: letsencrypt4${COMPOSE_PROJECT_NAME}
8987
env_file:
9088
- .env_test
@@ -94,7 +92,7 @@ services:
9492

9593
# Geoserver backend
9694
geoserver:
97-
image: geonode/geoserver:2.23.0
95+
image: geonode/geoserver:latest
9896
container_name: geoserver4${COMPOSE_PROJECT_NAME}
9997
healthcheck:
10098
test: "curl -m 10 --fail --silent --write-out 'HTTP CODE : %{http_code}\n' --output /dev/null http://geoserver:8080/geoserver/ows"
@@ -120,7 +118,7 @@ services:
120118
condition: service_healthy
121119

122120
data-dir-conf:
123-
image: geonode/geoserver_data:2.23.0
121+
image: geonode/geoserver_data:latest
124122
container_name: gsconf4${COMPOSE_PROJECT_NAME}
125123
entrypoint: sleep infinity
126124
volumes:
@@ -132,7 +130,7 @@ services:
132130
# PostGIS database.
133131
db:
134132
# use geonode official postgis 15 image
135-
image: geonode/postgis:15
133+
image: geonode/postgis:latest
136134
command: postgres -c "max_connections=${POSTGRESQL_MAX_CONNECTIONS}"
137135
container_name: db4${COMPOSE_PROJECT_NAME}
138136
env_file:

docker-compose.yml

+4-6
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ services:
6161

6262
# Nginx is serving django static and media files and proxies to django and geonode
6363
geonode:
64-
image: geonode/nginx:1.25.1
65-
build: ./scripts/docker/nginx/
64+
image: geonode/nginx:latest
6665
container_name: nginx4${COMPOSE_PROJECT_NAME}
6766
env_file:
6867
- .env
@@ -80,7 +79,6 @@ services:
8079
# Gets and installs letsencrypt certificates
8180
letsencrypt:
8281
image: geonode/letsencrypt:latest
83-
build: ./scripts/docker/letsencrypt/
8482
container_name: letsencrypt4${COMPOSE_PROJECT_NAME}
8583
env_file:
8684
- .env
@@ -90,7 +88,7 @@ services:
9088

9189
# Geoserver backend
9290
geoserver:
93-
image: geonode/geoserver:2.23.0
91+
image: geonode/geoserver:latest
9492
container_name: geoserver4${COMPOSE_PROJECT_NAME}
9593
healthcheck:
9694
test: "curl -m 10 --fail --silent --write-out 'HTTP CODE : %{http_code}\n' --output /dev/null http://geoserver:8080/geoserver/ows"
@@ -116,7 +114,7 @@ services:
116114
condition: service_healthy
117115

118116
data-dir-conf:
119-
image: geonode/geoserver_data:2.23.0
117+
image: geonode/geoserver_data:latest
120118
container_name: gsconf4${COMPOSE_PROJECT_NAME}
121119
entrypoint: sleep infinity
122120
volumes:
@@ -128,7 +126,7 @@ services:
128126
# PostGIS database.
129127
db:
130128
# use geonode official postgis 15 image
131-
image: geonode/postgis:15
129+
image: geonode/postgis:latest
132130
command: postgres -c "max_connections=${POSTGRESQL_MAX_CONNECTIONS}"
133131
container_name: db4${COMPOSE_PROJECT_NAME}
134132
env_file:

scripts/docker/letsencrypt/Dockerfile

-18
This file was deleted.

scripts/docker/letsencrypt/README.md

-15
This file was deleted.

scripts/docker/letsencrypt/crontab

-8
This file was deleted.

scripts/docker/letsencrypt/docker-entrypoint.sh

-52
This file was deleted.

scripts/docker/nginx/Dockerfile

-18
This file was deleted.

scripts/docker/nginx/docker-autoreload.sh

-37
This file was deleted.

scripts/docker/nginx/docker-entrypoint.sh

-67
This file was deleted.

0 commit comments

Comments
 (0)