diff --git a/install/docker/.env b/install/docker/.env index d10c51b901..5f094fba57 100644 --- a/install/docker/.env +++ b/install/docker/.env @@ -122,8 +122,6 @@ # identity # IDENTITY_PROFILE="dev" - IDENTITY_MIGRATION_CONTAINER_NAME=${CONTAINER_PREFIX}identity-migration - IDENTITY_MIGRATION_SERVER_PORT=8081 IDENTITY_AUTHORIZATION_CONTAINER_NAME=${CONTAINER_PREFIX}identity-authorization IDENTITY_AUTHORIZATION_SERVER_PORT=8080 IDENTITY_API_CONTAINER_NAME=${CONTAINER_PREFIX}identity-api diff --git a/install/docker/Dockerfile.app b/install/docker/Dockerfile.app index 35f482c91e..44fe0fb7a1 100644 --- a/install/docker/Dockerfile.app +++ b/install/docker/Dockerfile.app @@ -396,12 +396,6 @@ WORKDIR ${BUILD_PATH}/services/ASC.Identity.Registration/ COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Identity.Registration/service/ . CMD ["ASC.Identity.Registration"] -## ASC.Identity.Migration ## -FROM javarun AS identity-migration -WORKDIR ${BUILD_PATH}/services/ASC.Identity.Migration/ -COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Identity.Migration/service/ . -CMD ["ASC.Identity.Migration"] - ## image for k8s bin-share ## FROM busybox:latest AS bin_share RUN mkdir -p /app/ASC.Files/server && \ diff --git a/install/docker/build-identity.yml b/install/docker/build-identity.yml index 06b2789ca6..dce61ab03a 100644 --- a/install/docker/build-identity.yml +++ b/install/docker/build-identity.yml @@ -26,8 +26,6 @@ services: SPRING_PROFILES_ACTIVE: dev SPRING_APPLICATION_NAME: ASC.Identity.Authorization SERVER_PORT: 8080 - depends_on: - - onlyoffice-identity-migration onlyoffice-identity-api: build: @@ -43,21 +41,6 @@ services: SPRING_PROFILES_ACTIVE: dev SPRING_APPLICATION_NAME: ASC.Identity.Registration SERVER_PORT: 9090 - depends_on: - - onlyoffice-identity-migration - - onlyoffice-identity-migration: - build: - <<: *x-build - args: - - MODULE=infrastructure/infrastructure-migration-runner - image: "${HUB}${REPO}/${DOCKER_IMAGE_PREFIX}-identity-migration:${DOCKER_TAG}" - container_name: ${IDENTITY_MIGRATION_CONTAINER_NAME} - restart: "no" - ports: - - 8081:8081 - environment: - <<: *x-common-environment networks: default: diff --git a/install/docker/build.yml b/install/docker/build.yml index 110cc4eb58..6c64a8d938 100644 --- a/install/docker/build.yml +++ b/install/docker/build.yml @@ -153,9 +153,3 @@ services: target: identity-api image: "${REPO}/${DOCKER_IMAGE_PREFIX}-identity-api:${DOCKER_TAG}" - onlyoffice-identity-migration: - build: - context: ./ - dockerfile: "${DOCKERFILE}" - target: identity-migration - image: "${REPO}/${DOCKER_IMAGE_PREFIX}-identity-migration:${DOCKER_TAG}" diff --git a/install/docker/identity.yml b/install/docker/identity.yml index d8d8bc4871..f704e120d1 100644 --- a/install/docker/identity.yml +++ b/install/docker/identity.yml @@ -40,8 +40,6 @@ services: test: curl --fail ${SERVICE_IDENTITY}/health/ || exit 1 volumes: - log_data:/var/log/onlyoffice - depends_on: - - onlyoffice-identity-migration onlyoffice-identity-api: image: "${HUB}${REPO}/${DOCKER_IMAGE_PREFIX}-identity-api:${DOCKER_TAG}" @@ -58,18 +56,6 @@ services: test: curl --fail ${SERVICE_IDENTITY_API}/health/ || exit 1 volumes: - log_data:/var/log/onlyoffice - depends_on: - - onlyoffice-identity-migration - - onlyoffice-identity-migration: - image: "${HUB}${REPO}/${DOCKER_IMAGE_PREFIX}-identity-migration:${DOCKER_TAG}" - container_name: ${IDENTITY_MIGRATION_CONTAINER_NAME} - user: "${UID}:${GID}" - restart: on-failure - expose: - - "${IDENTITY_MIGRATION_SERVER_PORT}" - environment: - <<: *x-common-environment networks: default: