mirror of
https://github.com/umap-project/umap.git
synced 2025-05-04 21:51:50 +02:00
chore: use latest Docker keyword for docker-compose
This commit is contained in:
parent
a73134cdb0
commit
7a0d36fdb3
2 changed files with 15 additions and 7 deletions
4
Makefile
4
Makefile
|
@ -43,8 +43,8 @@ minor: ## Bump the current version to a new minor one
|
||||||
docker: ## Create a new Docker image and publish it
|
docker: ## Create a new Docker image and publish it
|
||||||
$(eval VERSION=$(shell hatch version))
|
$(eval VERSION=$(shell hatch version))
|
||||||
@echo "Version to build: ${VERSION}"
|
@echo "Version to build: ${VERSION}"
|
||||||
docker build -t umap/umap:${VERSION} .
|
docker build -t umap/umap:${VERSION} -t umap/umap:latest .
|
||||||
docker push umap/umap:${VERSION}
|
docker push --all-tags umap/umap:${VERSION}
|
||||||
|
|
||||||
.PHONY: build
|
.PHONY: build
|
||||||
build: ## Build the Python package before release
|
build: ## Build the Python package before release
|
||||||
|
|
|
@ -6,6 +6,7 @@ services:
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD-SHELL", "pg_isready -U postgres"]
|
test: ["CMD-SHELL", "pg_isready -U postgres"]
|
||||||
interval: 2s
|
interval: 2s
|
||||||
|
# check https://hub.docker.com/r/postgis/postgis to see available versions
|
||||||
image: postgis/postgis:14-3.3-alpine
|
image: postgis/postgis:14-3.3-alpine
|
||||||
environment:
|
environment:
|
||||||
- POSTGRES_HOST_AUTH_METHOD=trust
|
- POSTGRES_HOST_AUTH_METHOD=trust
|
||||||
|
@ -16,18 +17,25 @@ services:
|
||||||
depends_on:
|
depends_on:
|
||||||
db:
|
db:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
image: umap/umap:2.0.2
|
image: umap/umap:latest
|
||||||
ports:
|
ports:
|
||||||
- "${PORT-8000}:8000"
|
# modify the external port (8001, on the left) if desired, but make sure it matches SITE_URL, below
|
||||||
|
- "8001:8000"
|
||||||
environment:
|
environment:
|
||||||
- DATABASE_URL=postgis://postgres@db/postgres
|
- DATABASE_URL=postgis://postgres@db/postgres
|
||||||
- SECRET_KEY=some-long-and-weirdly-unrandom-secret-key
|
- SECRET_KEY=some-long-and-weirdly-unrandom-secret-key
|
||||||
- SITE_URL=https://umap.local/
|
- SITE_URL=https://localhost:8001/
|
||||||
- UMAP_ALLOW_ANONYMOUS=True
|
- UMAP_ALLOW_ANONYMOUS=True
|
||||||
- DEBUG=1
|
- DEBUG=1
|
||||||
|
- STATIC_ROOT=/srv/umap/static
|
||||||
|
- MEDIA_ROOT=/srv/umap/uploads
|
||||||
volumes:
|
volumes:
|
||||||
- data:/srv/umap/uploads
|
- umap_userdata:/srv/umap/uploads
|
||||||
|
# FIX the path on the left, below, to your location
|
||||||
|
# OPTIONAL, you can comment the line below out for default
|
||||||
|
# values to apply
|
||||||
|
- /home/ubuntu/umap.conf:/etc/umap/umap.conf
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
data:
|
umap_userdata:
|
||||||
db:
|
db:
|
||||||
|
|
Loading…
Reference in a new issue