Updated to gitea registry
This commit is contained in:
19
Makefile
19
Makefile
@@ -94,7 +94,8 @@ refresh: docker-refresh
|
||||
|
||||
build: version=$(if $(v),$(v),latest)
|
||||
build: folder=$(if $(f),$(f),nginx)
|
||||
build: image=aviation-${folder}:${version}
|
||||
build: registry=$(if $(r),$(r),gitea.bensherriff.com/bsherriff)
|
||||
build: image=${registry}/aviation-${folder}:${version}
|
||||
build: ## Build a specific docker image (`make build f=httpd`)
|
||||
docker buildx build \
|
||||
-f ${folder}/Dockerfile \
|
||||
@@ -105,7 +106,21 @@ build: ## Build a specific docker image (`make build f=httpd`)
|
||||
--build-arg VCS_REF=$$(git rev-parse HEAD) \
|
||||
${folder}
|
||||
|
||||
docker-build: build
|
||||
push: version=$(if $(v),$(v),latest)
|
||||
push: folder=$(if $(f),$(f),nginx)
|
||||
push: registry=$(if $(r),$(r),gitea.bensherriff.com/bsherriff)
|
||||
push: platform=$(if $(p),$(p),linux/amd64,linux/arm64)
|
||||
push: image=${registry}/aviation-${folder}:${version}
|
||||
push: ## Build and push a specific docker image (`make push f=httpd`)
|
||||
docker buildx build \
|
||||
-f ${folder}/Dockerfile \
|
||||
--platform ${platform} \
|
||||
-t ${image} \
|
||||
--push \
|
||||
--build-arg BUILD_DATE=$$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
|
||||
--build-arg BUILD_VERSION=${version} \
|
||||
--build-arg VCS_REF=$$(git rev-parse HEAD) \
|
||||
${folder}
|
||||
|
||||
cert: domain=$(if $(d),$(d),${NGINX_HOST})
|
||||
cert: ## Generate a cert for the given domain
|
||||
|
||||
@@ -10,8 +10,7 @@ x-restart: &default_restart
|
||||
name: aviation
|
||||
services:
|
||||
nginx:
|
||||
# image: nginx
|
||||
image: aviation-nginx:latest
|
||||
image: gitea.bensherriff.com/bsherriff/aviation-nginx:latest
|
||||
container_name: aviation-nginx
|
||||
build:
|
||||
context: ./nginx
|
||||
@@ -32,7 +31,7 @@ services:
|
||||
<<: *default_restart
|
||||
|
||||
postgres:
|
||||
image: postgis/postgis:17-3.5
|
||||
image: gitea.bensherriff.com/homelab/postgis:17.4
|
||||
container_name: aviation-postgres
|
||||
env_file: *env
|
||||
environment:
|
||||
@@ -51,7 +50,7 @@ services:
|
||||
<<: *default_restart
|
||||
|
||||
redis:
|
||||
image: redis:8.0-M03 # Replace with valkey?
|
||||
image: gitea.bensherriff.com/homelab/redis:8.0-M03
|
||||
container_name: aviation-redis
|
||||
volumes:
|
||||
- redis:/data
|
||||
@@ -69,7 +68,7 @@ services:
|
||||
<<: *default_restart
|
||||
|
||||
minio:
|
||||
image: minio/minio:RELEASE.2025-02-28T09-55-16Z
|
||||
image: gitea.bensherriff.com/homelab/minio:RELEASE.2025-02-28T09-55-16Z
|
||||
container_name: aviation-minio
|
||||
environment:
|
||||
MINIO_ROOT_USER: ${MINIO_ROOT_USER}
|
||||
@@ -89,7 +88,7 @@ services:
|
||||
<<: *default_restart
|
||||
|
||||
api:
|
||||
image: aviation-api:latest
|
||||
image: gitea.bensherriff.com/bsherriff/aviation-api:latest
|
||||
container_name: aviation-api
|
||||
build:
|
||||
context: ./api
|
||||
@@ -120,7 +119,7 @@ services:
|
||||
<<: *default_restart
|
||||
|
||||
ui:
|
||||
image: aviation-ui:latest
|
||||
image: gitea.bensherriff.com/bsherriff/aviation-ui:latest
|
||||
container_name: aviation-ui
|
||||
build:
|
||||
context: ./ui
|
||||
|
||||
Reference in New Issue
Block a user