Update deps, fix Docker build errors
This commit is contained in:
parent
162390008b
commit
c62bfd2a4c
31 changed files with 832 additions and 1227 deletions
|
|
@ -35,7 +35,9 @@ x-bridge-vars: &common-bridge-variables
|
|||
|
||||
services:
|
||||
bridge-frontend:
|
||||
build: ../../apps/bridge-frontend
|
||||
build:
|
||||
context: ../../
|
||||
dockerfile: ./apps/bridge-frontend/Dockerfile
|
||||
container_name: bridge-frontend
|
||||
restart: ${RESTART}
|
||||
ports:
|
||||
|
|
@ -43,7 +45,9 @@ services:
|
|||
environment: *common-bridge-variables
|
||||
|
||||
bridge-worker:
|
||||
build: ../../apps/bridge-worker
|
||||
build:
|
||||
context: ../../
|
||||
dockerfile: ./apps/bridge-worker/Dockerfile
|
||||
container_name: bridge-worker
|
||||
restart: ${RESTART}
|
||||
environment: *common-bridge-variables
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ services:
|
|||
container_name: leafcutter
|
||||
restart: ${RESTART}
|
||||
build:
|
||||
context: .
|
||||
dockerfile: ../../apps/leafcutter/Dockerfile
|
||||
context: ../../
|
||||
dockerfile: ./apps/leafcutter/Dockerfile
|
||||
image: registry.gitlab.com/digiresilience/link/link-stack/leafcutter:${LINK_STACK_VERSION}
|
||||
expose:
|
||||
- "3000"
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ services:
|
|||
container_name: link
|
||||
restart: ${RESTART}
|
||||
build:
|
||||
context: .
|
||||
dockerfile: ../../apps/link/Dockerfile
|
||||
context: ../../
|
||||
dockerfile: ./apps/link/Dockerfile
|
||||
image: registry.gitlab.com/digiresilience/link/link-stack/link:${LINK_STACK_VERSION}
|
||||
expose:
|
||||
- "3000"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# need to include changes from https://github.com/zammad/zammad/blob/506c295c1d15f8dc19fc8bb69af1fb721bf10f49/contrib/docker/setup.sh
|
||||
|
||||
ARG ZAMMAD_VERSION=6.3.0
|
||||
ARG ZAMMAD_VERSION=6.2.0
|
||||
|
||||
FROM node:16.18.0-slim as node
|
||||
FROM zammad/zammad-docker-compose:${ZAMMAD_VERSION} AS builder
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue