Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fixes #11817] Drop Nginx and Letsencrypt Dockerfiles #11818

Merged
merged 5 commits into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions docker-compose-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ services:

# Nginx is serving django static and media files and proxies to django and geonode
geonode:
image: geonode/nginx:1.25.1
image: geonode/nginx:latest
build: ./scripts/docker/nginx/
container_name: nginx4${COMPOSE_PROJECT_NAME}
env_file:
Expand All @@ -71,7 +71,6 @@ services:
# Gets and installs letsencrypt certificates
letsencrypt:
image: geonode/letsencrypt:latest
build: ./scripts/docker/letsencrypt/
container_name: letsencrypt4${COMPOSE_PROJECT_NAME}
env_file:
- .env
Expand All @@ -81,7 +80,7 @@ services:

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

data-dir-conf:
image: geonode/geoserver_data:2.23.0
image: geonode/geoserver_data:latest
container_name: gsconf4${COMPOSE_PROJECT_NAME}
entrypoint: sleep infinity
volumes:
Expand All @@ -119,7 +118,7 @@ services:
# PostGIS database.
db:
# use geonode official postgis 15 image
image: geonode/postgis:15
image: geonode/postgis:latest
command: postgres -c "max_connections=${POSTGRESQL_MAX_CONNECTIONS}"
container_name: db4${COMPOSE_PROJECT_NAME}
env_file:
Expand Down
4 changes: 2 additions & 2 deletions docker-compose-geoserver-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '2.2'
services:

data-dir-conf:
image: geonode/geoserver_data:2.23.0
image: geonode/geoserver_data:latest
restart: on-failure
container_name: gsconf4${COMPOSE_PROJECT_NAME}
labels:
Expand All @@ -13,7 +13,7 @@ services:
- geoserver-data-dir:/geoserver_data/data

geoserver:
image: geonode/geoserver:2.23.0
image: geonode/geoserver:latest
restart: unless-stopped
container_name: geoserver4${COMPOSE_PROJECT_NAME}
stdin_open: true
Expand Down
10 changes: 4 additions & 6 deletions docker-compose-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ services:

# Nginx is serving django static and media files and proxies to django and geonode
geonode:
image: geonode/nginx:1.25.1
build: ./scripts/docker/nginx/
image: geonode/nginx:latest
container_name: nginx4${COMPOSE_PROJECT_NAME}
env_file:
- .env_test
Expand Down Expand Up @@ -84,7 +83,6 @@ services:
# Gets and installs letsencrypt certificates
letsencrypt:
image: geonode/letsencrypt:latest
build: ./scripts/docker/letsencrypt/
container_name: letsencrypt4${COMPOSE_PROJECT_NAME}
env_file:
- .env_test
Expand All @@ -94,7 +92,7 @@ services:

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

data-dir-conf:
image: geonode/geoserver_data:2.23.0
image: geonode/geoserver_data:latest
container_name: gsconf4${COMPOSE_PROJECT_NAME}
entrypoint: sleep infinity
volumes:
Expand All @@ -132,7 +130,7 @@ services:
# PostGIS database.
db:
# use geonode official postgis 15 image
image: geonode/postgis:15
image: geonode/postgis:latest
command: postgres -c "max_connections=${POSTGRESQL_MAX_CONNECTIONS}"
container_name: db4${COMPOSE_PROJECT_NAME}
env_file:
Expand Down
10 changes: 4 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@ services:

# Nginx is serving django static and media files and proxies to django and geonode
geonode:
image: geonode/nginx:1.25.1
build: ./scripts/docker/nginx/
image: geonode/nginx:latest
container_name: nginx4${COMPOSE_PROJECT_NAME}
env_file:
- .env
Expand All @@ -80,7 +79,6 @@ services:
# Gets and installs letsencrypt certificates
letsencrypt:
image: geonode/letsencrypt:latest
build: ./scripts/docker/letsencrypt/
container_name: letsencrypt4${COMPOSE_PROJECT_NAME}
env_file:
- .env
Expand All @@ -90,7 +88,7 @@ services:

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

data-dir-conf:
image: geonode/geoserver_data:2.23.0
image: geonode/geoserver_data:latest
container_name: gsconf4${COMPOSE_PROJECT_NAME}
entrypoint: sleep infinity
volumes:
Expand All @@ -128,7 +126,7 @@ services:
# PostGIS database.
db:
# use geonode official postgis 15 image
image: geonode/postgis:15
image: geonode/postgis:latest
command: postgres -c "max_connections=${POSTGRESQL_MAX_CONNECTIONS}"
container_name: db4${COMPOSE_PROJECT_NAME}
env_file:
Expand Down
18 changes: 0 additions & 18 deletions scripts/docker/letsencrypt/Dockerfile

This file was deleted.

15 changes: 0 additions & 15 deletions scripts/docker/letsencrypt/README.md

This file was deleted.

8 changes: 0 additions & 8 deletions scripts/docker/letsencrypt/crontab

This file was deleted.

52 changes: 0 additions & 52 deletions scripts/docker/letsencrypt/docker-entrypoint.sh

This file was deleted.

18 changes: 0 additions & 18 deletions scripts/docker/nginx/Dockerfile

This file was deleted.

37 changes: 0 additions & 37 deletions scripts/docker/nginx/docker-autoreload.sh

This file was deleted.

67 changes: 0 additions & 67 deletions scripts/docker/nginx/docker-entrypoint.sh

This file was deleted.

Loading