fix: correct Docker registry strategy, add custom Directus Dockerfile, and revert app tagging
This commit is contained in:
@@ -108,7 +108,7 @@ jobs:
|
|||||||
-f packages/infra/docker/Dockerfile.nextjs \
|
-f packages/infra/docker/Dockerfile.nextjs \
|
||||||
--push .
|
--push .
|
||||||
|
|
||||||
- name: 🏗️ Build & Push Gatekeeper
|
- name: 🏗️ Build & Push Gatekeeper (Product)
|
||||||
env:
|
env:
|
||||||
TAG: ${{ github.ref_name }}
|
TAG: ${{ github.ref_name }}
|
||||||
run: |
|
run: |
|
||||||
@@ -118,3 +118,14 @@ jobs:
|
|||||||
-t registry.infra.mintel.me/mintel/gatekeeper:latest \
|
-t registry.infra.mintel.me/mintel/gatekeeper:latest \
|
||||||
-f packages/infra/docker/Dockerfile.gatekeeper \
|
-f packages/infra/docker/Dockerfile.gatekeeper \
|
||||||
--push .
|
--push .
|
||||||
|
|
||||||
|
- name: 🏗️ Build & Push Directus (Base)
|
||||||
|
env:
|
||||||
|
TAG: ${{ github.ref_name }}
|
||||||
|
run: |
|
||||||
|
docker buildx build \
|
||||||
|
--platform linux/amd64,linux/arm64 \
|
||||||
|
-t registry.infra.mintel.me/mintel/directus:$TAG \
|
||||||
|
-t registry.infra.mintel.me/mintel/directus:latest \
|
||||||
|
-f packages/infra/docker/Dockerfile.directus \
|
||||||
|
--push .
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ services:
|
|||||||
NEXT_PUBLIC_UMAMI_SCRIPT_URL: ${NEXT_PUBLIC_UMAMI_SCRIPT_URL}
|
NEXT_PUBLIC_UMAMI_SCRIPT_URL: ${NEXT_PUBLIC_UMAMI_SCRIPT_URL}
|
||||||
NEXT_PUBLIC_TARGET: ${TARGET:-development}
|
NEXT_PUBLIC_TARGET: ${TARGET:-development}
|
||||||
DIRECTUS_URL: ${DIRECTUS_URL:-http://directus:8055}
|
DIRECTUS_URL: ${DIRECTUS_URL:-http://directus:8055}
|
||||||
image: registry.infra.mintel.me/mintel/sample-website:latest
|
image: sample-website:latest
|
||||||
container_name: sample-website-app
|
container_name: sample-website-app
|
||||||
restart: always
|
restart: always
|
||||||
networks:
|
networks:
|
||||||
@@ -24,7 +24,7 @@ services:
|
|||||||
- "traefik.http.services.sample-website.loadbalancer.server.port=3000"
|
- "traefik.http.services.sample-website.loadbalancer.server.port=3000"
|
||||||
|
|
||||||
directus:
|
directus:
|
||||||
image: directus/directus:11
|
image: registry.infra.mintel.me/mintel/directus:latest
|
||||||
container_name: sample-website-directus
|
container_name: sample-website-directus
|
||||||
restart: always
|
restart: always
|
||||||
networks:
|
networks:
|
||||||
|
|||||||
12
packages/infra/docker/Dockerfile.directus
Normal file
12
packages/infra/docker/Dockerfile.directus
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
FROM directus/directus:11
|
||||||
|
|
||||||
|
# Add any custom extensions or configurations here if needed
|
||||||
|
# COPY ./extensions /directus/extensions
|
||||||
|
|
||||||
|
# Default environment for optimized production use
|
||||||
|
ENV LOGGER_LEVEL="info"
|
||||||
|
ENV WEBSOCKETS_ENABLED="true"
|
||||||
|
|
||||||
|
# Health check
|
||||||
|
HEALTHCHECK --interval=30s --timeout=30s --start-period=5s --retries=3 \
|
||||||
|
CMD curl -f http://localhost:8055/health || exit 1
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: registry.infra.mintel.me/mintel/${APP_NAME:-app}:${IMAGE_TAG:-latest}
|
image: ${APP_NAME:-app}:latest
|
||||||
restart: always
|
restart: always
|
||||||
networks:
|
networks:
|
||||||
- infra
|
- infra
|
||||||
@@ -55,7 +55,7 @@ services:
|
|||||||
- "traefik.http.services.${PROJECT_NAME}-gatekeeper.loadbalancer.server.port=3000"
|
- "traefik.http.services.${PROJECT_NAME}-gatekeeper.loadbalancer.server.port=3000"
|
||||||
|
|
||||||
directus:
|
directus:
|
||||||
image: directus/directus:11
|
image: registry.infra.mintel.me/mintel/directus:latest
|
||||||
restart: always
|
restart: always
|
||||||
networks:
|
networks:
|
||||||
- infra
|
- infra
|
||||||
|
|||||||
Reference in New Issue
Block a user